aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/arp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index fdf12d1c350e..9eb6d3ab2977 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -837,7 +837,7 @@ static int arp_process(struct sk_buff *skb)
837 } else if (IN_DEV_FORWARD(in_dev)) { 837 } else if (IN_DEV_FORWARD(in_dev)) {
838 if ((rt->rt_flags&RTCF_DNAT) || 838 if ((rt->rt_flags&RTCF_DNAT) ||
839 (addr_type == RTN_UNICAST && rt->u.dst.dev != dev && 839 (addr_type == RTN_UNICAST && rt->u.dst.dev != dev &&
840 (arp_fwd_proxy(in_dev, rt) || pneigh_lookup(&arp_tbl, &tip, dev, 0)))) { 840 (arp_fwd_proxy(in_dev, rt) || pneigh_lookup(&arp_tbl, &init_net, &tip, dev, 0)))) {
841 n = neigh_event_ns(&arp_tbl, sha, &sip, dev); 841 n = neigh_event_ns(&arp_tbl, sha, &sip, dev);
842 if (n) 842 if (n)
843 neigh_release(n); 843 neigh_release(n);
@@ -980,7 +980,7 @@ static int arp_req_set_public(struct net *net, struct arpreq *r,
980 return -ENODEV; 980 return -ENODEV;
981 } 981 }
982 if (mask) { 982 if (mask) {
983 if (pneigh_lookup(&arp_tbl, &ip, dev, 1) == NULL) 983 if (pneigh_lookup(&arp_tbl, &init_net, &ip, dev, 1) == NULL)
984 return -ENOBUFS; 984 return -ENOBUFS;
985 return 0; 985 return 0;
986 } 986 }
@@ -1089,7 +1089,7 @@ static int arp_req_delete_public(struct net *net, struct arpreq *r,
1089 __be32 mask = ((struct sockaddr_in *)&r->arp_netmask)->sin_addr.s_addr; 1089 __be32 mask = ((struct sockaddr_in *)&r->arp_netmask)->sin_addr.s_addr;
1090 1090
1091 if (mask == htonl(0xFFFFFFFF)) 1091 if (mask == htonl(0xFFFFFFFF))
1092 return pneigh_delete(&arp_tbl, &ip, dev); 1092 return pneigh_delete(&arp_tbl, &init_net, &ip, dev);
1093 1093
1094 if (mask) 1094 if (mask)
1095 return -EINVAL; 1095 return -EINVAL;
@@ -1375,8 +1375,8 @@ static const struct seq_operations arp_seq_ops = {
1375 1375
1376static int arp_seq_open(struct inode *inode, struct file *file) 1376static int arp_seq_open(struct inode *inode, struct file *file)
1377{ 1377{
1378 return seq_open_private(file, &arp_seq_ops, 1378 return seq_open_net(inode, file, &arp_seq_ops,
1379 sizeof(struct neigh_seq_state)); 1379 sizeof(struct neigh_seq_state));
1380} 1380}
1381 1381
1382static const struct file_operations arp_seq_fops = { 1382static const struct file_operations arp_seq_fops = {
@@ -1384,7 +1384,7 @@ static const struct file_operations arp_seq_fops = {
1384 .open = arp_seq_open, 1384 .open = arp_seq_open,
1385 .read = seq_read, 1385 .read = seq_read,
1386 .llseek = seq_lseek, 1386 .llseek = seq_lseek,
1387 .release = seq_release_private, 1387 .release = seq_release_net,
1388}; 1388};
1389 1389
1390static int __init arp_proc_init(void) 1390static int __init arp_proc_init(void)