aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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,
1284 struct neigh_parms *p; 1284 struct neigh_parms *p;
1285 1285
1286 for (p = &tbl->parms; p; p = p->next) { 1286 for (p = &tbl->parms; p; p = p->next) {
1287 if (p->net != net) 1287 if ((p->dev && p->dev->ifindex == ifindex && p->net == net) ||
1288 continue;
1289 if ((p->dev && p->dev->ifindex == ifindex) ||
1290 (!p->dev && !ifindex)) 1288 (!p->dev && !ifindex))
1291 return p; 1289 return p;
1292 } 1290 }