summaryrefslogtreecommitdiffstats
path: root/net/ipv4/af_inet.c
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2007-12-16 13:30:39 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-28 14:58:09 -0800
commit32e569b7277f13c4b27bb29c761189963e49ce7a (patch)
tree63c1a7b0b44169644e7efdc4f351d6b8cb13cdd7 /net/ipv4/af_inet.c
parentea40b324d791d86a42b858d073007de4d133227e (diff)
downloadop-kernel-dev-32e569b7277f13c4b27bb29c761189963e49ce7a.zip
op-kernel-dev-32e569b7277f13c4b27bb29c761189963e49ce7a.tar.gz
[IPV4]: Pass the net pointer to the arp_req_set_proxy()
This one will need to set the IPV4_DEVCONF_ALL(PROXY_ARP), but there's no ways to get the net right in place, so we have to pull one from the inet_ioctl's struct sock. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/af_inet.c')
-rw-r--r--net/ipv4/af_inet.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 5089a36..03633b7 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -798,7 +798,7 @@ int inet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
case SIOCDARP:
case SIOCGARP:
case SIOCSARP:
- err = arp_ioctl(cmd, (void __user *)arg);
+ err = arp_ioctl(sk->sk_net, cmd, (void __user *)arg);
break;
case SIOCGIFADDR:
case SIOCSIFADDR:
OpenPOWER on IntegriCloud