summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2008-02-28 20:48:25 -0800
committerDavid S. Miller <davem@davemloft.net>2008-02-28 20:48:25 -0800
commit0c65babd6ce758dd06330b3d9d677b7624f9e3fa (patch)
tree3c7e0d7da31c1c7946233da327101a1c9756b0a3 /net
parent4ab438fcd7373da9e559576e418e890b7cfd94f4 (diff)
[NETNS]: Default arp parameters lookup.
Default ARP parameters should be findable regardless of the context. Required to make inetdev_event working. Signed-off-by: Denis V. Lunev <den@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/neighbour.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index be8b264b29bf..31b6567f0b6a 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -1284,9 +1284,7 @@ static inline struct neigh_parms *lookup_neigh_params(struct neigh_table *tbl,
struct neigh_parms *p;
for (p = &tbl->parms; p; p = p->next) {
- if (p->net != net)
- continue;
- if ((p->dev && p->dev->ifindex == ifindex) ||
+ if ((p->dev && p->dev->ifindex == ifindex && p->net == net) ||
(!p->dev && !ifindex))
return p;
}