diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2011-05-04 17:51:50 -0700 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2011-05-10 14:36:03 -0700 |
| commit | f063052947f770845a6252f7fa24f6f624592a24 (patch) | |
| tree | 17513dbd49d5a1a08443d76374d10dda6114b7a7 /include | |
| parent | a00eaf11a223c63fbb212369d6db69ce4c55a2d1 (diff) | |
net: Allow setting the network namespace by fd
Take advantage of the new abstraction and allow network devices
to be placed in any network namespace that we have a fd to talk
about.
Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: Daniel Lezcano <daniel.lezcano@free.fr>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/if_link.h | 1 | ||||
| -rw-r--r-- | include/net/net_namespace.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/if_link.h b/include/linux/if_link.h index f4a2e6b1b864..0ee969a5593d 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 }; diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 3ae491932bc8..dcc8f5749d3f 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -119,6 +119,7 @@ static inline struct net *copy_net_ns(unsigned long flags, struct net *net_ns) extern struct list_head net_namespace_list; extern struct net *get_net_ns_by_pid(pid_t pid); +extern struct net *get_net_ns_by_fd(int pid); #ifdef CONFIG_NET_NS extern void __put_net(struct net *net); |