diff options
author | Daniel Lezcano <dlezcano@fr.ibm.com> | 2008-03-05 13:46:57 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-05 13:46:57 -0500 |
commit | af2849377e7b70afa1274e475be50286cd0ef6eb (patch) | |
tree | 56ef076e3646085138353ffe03b985a15edce6bf /net/ipv6/af_inet6.c | |
parent | 300bf591deca8d108799e70e9300dc31765643e3 (diff) |
[NETNS][IPV6] addrconf - Pass the proper network namespace parameters to addrconf
This patch propagates the network namespace pointer to the address
configuration routines which need it, which means adding a new
parameter to these functions, and make them use it instead of using
the initial network namespace.
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 430bbd2139c..afe9276d042 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c | |||
@@ -454,11 +454,11 @@ int inet6_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) | |||
454 | return(ipv6_route_ioctl(net, cmd, (void __user *)arg)); | 454 | return(ipv6_route_ioctl(net, cmd, (void __user *)arg)); |
455 | 455 | ||
456 | case SIOCSIFADDR: | 456 | case SIOCSIFADDR: |
457 | return addrconf_add_ifaddr((void __user *) arg); | 457 | return addrconf_add_ifaddr(net, (void __user *) arg); |
458 | case SIOCDIFADDR: | 458 | case SIOCDIFADDR: |
459 | return addrconf_del_ifaddr((void __user *) arg); | 459 | return addrconf_del_ifaddr(net, (void __user *) arg); |
460 | case SIOCSIFDSTADDR: | 460 | case SIOCSIFDSTADDR: |
461 | return addrconf_set_dstaddr((void __user *) arg); | 461 | return addrconf_set_dstaddr(net, (void __user *) arg); |
462 | default: | 462 | default: |
463 | if (!sk->sk_prot->ioctl) | 463 | if (!sk->sk_prot->ioctl) |
464 | return -ENOIOCTLCMD; | 464 | return -ENOIOCTLCMD; |