diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /net/ipv4/fib_semantics.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'net/ipv4/fib_semantics.c')
| -rw-r--r-- | net/ipv4/fib_semantics.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index 9b096d6ff3f2..ed19aa6919c2 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c | |||
| @@ -228,7 +228,7 @@ static struct fib_info *fib_find_info(const struct fib_info *nfi) | |||
| 228 | head = &fib_info_hash[hash]; | 228 | head = &fib_info_hash[hash]; |
| 229 | 229 | ||
| 230 | hlist_for_each_entry(fi, node, head, fib_hash) { | 230 | hlist_for_each_entry(fi, node, head, fib_hash) { |
| 231 | if (fi->fib_net != nfi->fib_net) | 231 | if (!net_eq(fi->fib_net, nfi->fib_net)) |
| 232 | continue; | 232 | continue; |
| 233 | if (fi->fib_nhs != nfi->fib_nhs) | 233 | if (fi->fib_nhs != nfi->fib_nhs) |
| 234 | continue; | 234 | continue; |
| @@ -1047,7 +1047,7 @@ int fib_sync_down_addr(struct net *net, __be32 local) | |||
| 1047 | return 0; | 1047 | return 0; |
| 1048 | 1048 | ||
| 1049 | hlist_for_each_entry(fi, node, head, fib_lhash) { | 1049 | hlist_for_each_entry(fi, node, head, fib_lhash) { |
| 1050 | if (fi->fib_net != net) | 1050 | if (!net_eq(fi->fib_net, net)) |
| 1051 | continue; | 1051 | continue; |
| 1052 | if (fi->fib_prefsrc == local) { | 1052 | if (fi->fib_prefsrc == local) { |
| 1053 | fi->fib_flags |= RTNH_F_DEAD; | 1053 | fi->fib_flags |= RTNH_F_DEAD; |