diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-16 01:12:58 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-16 01:12:58 +0400 |
| commit | 1e09481365ce248dbb4eb06dad70129bb5807037 (patch) | |
| tree | c0cff5bef95c8b5e7486f144718ade9a06c284dc /net/ipv6/exthdrs.c | |
| parent | 3e2f69fdd1b00166e7d589bce56b2d36a9e74374 (diff) | |
| parent | b9d2252c1e44fa83a4e65fdc9eb93db6297c55af (diff) | |
| download | linux-1e09481365ce248dbb4eb06dad70129bb5807037.tar.xz | |
Merge branch 'linus' into core/softlockup
Conflicts:
kernel/softlockup.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/ipv6/exthdrs.c')
| -rw-r--r-- | net/ipv6/exthdrs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c index 3cd1c993d52b..dcf94fdfb863 100644 --- a/net/ipv6/exthdrs.c +++ b/net/ipv6/exthdrs.c @@ -445,7 +445,7 @@ looped_back: kfree_skb(skb); return -1; } - if (!ipv6_chk_home_addr(&init_net, addr)) { + if (!ipv6_chk_home_addr(dev_net(skb->dst->dev), addr)) { IP6_INC_STATS_BH(ip6_dst_idev(skb->dst), IPSTATS_MIB_INADDRERRORS); kfree_skb(skb); |