diff options
author | Daniel Lezcano <dlezcano@fr.ibm.com> | 2008-03-04 16:47:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-04 16:47:47 -0500 |
commit | 5578689a4e3c04f2d43ea39736fd3fa396d80c6e (patch) | |
tree | 3fca397549e4b08bf71e07a14527dc2f793f15f9 /net/ipv6/af_inet6.c | |
parent | 7b4da53229bb61469bdab321384b9a13406e3485 (diff) |
[NETNS][IPV6] route6 - make route6 per namespace
This patch makes the routing engine use the network namespaces to
access routing informations: Add a network namespace parameter to
ipv6_route_ioctl and propagate the network namespace value to all the
routing code that have not yet been changed.
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: Benjamin Thery <benjamin.thery@bull.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/af_inet6.c')
-rw-r--r-- | net/ipv6/af_inet6.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 73021d5baece..60b8a2254046 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c | |||
@@ -440,6 +440,7 @@ EXPORT_SYMBOL(inet6_getname); | |||
440 | int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) | 440 | int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) |
441 | { | 441 | { |
442 | struct sock *sk = sock->sk; | 442 | struct sock *sk = sock->sk; |
443 | struct net *net = sk->sk_net; | ||
443 | 444 | ||
444 | switch(cmd) | 445 | switch(cmd) |
445 | { | 446 | { |
@@ -452,7 +453,7 @@ int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) | |||
452 | case SIOCADDRT: | 453 | case SIOCADDRT: |
453 | case SIOCDELRT: | 454 | case SIOCDELRT: |
454 | 455 | ||
455 | return(ipv6_route_ioctl(cmd,(void __user *)arg)); | 456 | return(ipv6_route_ioctl(net, cmd, (void __user *)arg)); |
456 | 457 | ||
457 | case SIOCSIFADDR: | 458 | case SIOCSIFADDR: |
458 | return addrconf_add_ifaddr((void __user *) arg); | 459 | return addrconf_add_ifaddr((void __user *) arg); |