diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 18:10:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 18:10:16 -0700 |
| commit | 14d74e0cab7a7779a7ff0c3863c04c8a8e507106 (patch) | |
| tree | 5e27d7495f8f7ce178b637d588ec42bd7b4173d8 /include/linux/if_link.h | |
| parent | 49a78d085fa6b44d6ed791923c7172a6433589c2 (diff) | |
| parent | 956c920786694f51601a0ef7ee12956fd6aa216e (diff) | |
| download | olio-linux-3.10-14d74e0cab7a7779a7ff0c3863c04c8a8e507106.tar.xz olio-linux-3.10-14d74e0cab7a7779a7ff0c3863c04c8a8e507106.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd
* git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd:
net: fix get_net_ns_by_fd for !CONFIG_NET_NS
ns proc: Return -ENOENT for a nonexistent /proc/self/ns/ entry.
ns: Declare sys_setns in syscalls.h
net: Allow setting the network namespace by fd
ns proc: Add support for the ipc namespace
ns proc: Add support for the uts namespace
ns proc: Add support for the network namespace.
ns: Introduce the setns syscall
ns: proc files for namespace naming policy.
Diffstat (limited to 'include/linux/if_link.h')
| -rw-r--r-- | include/linux/if_link.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/if_link.h b/include/linux/if_link.h index f4a2e6b1b86..0ee969a5593 100644 --- a/include/linux/if_link.h +++ b/include/linux/if_link.h @@ -136,6 +136,7 @@ enum { IFLA_PORT_SELF, IFLA_AF_SPEC, IFLA_GROUP, /* Group the device belongs to */ + IFLA_NET_NS_FD, __IFLA_MAX }; |