diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-14 20:23:54 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-14 20:23:54 -0700 |
| commit | 2aec609fb45e84d65bc8eabc7b650bbecb1cc179 (patch) | |
| tree | eb3e8a79604113392d0ee74b19dbc1dfce579c11 /net/ipv6 | |
| parent | 4c8894980010536915c4f5513ee180e3614aeca9 (diff) | |
| parent | 9076689ab07974a6f5d230fc241448f7a77e9078 (diff) | |
| download | linux-stable-2aec609fb45e84d65bc8eabc7b650bbecb1cc179.tar.gz linux-stable-2aec609fb45e84d65bc8eabc7b650bbecb1cc179.tar.bz2 linux-stable-2aec609fb45e84d65bc8eabc7b650bbecb1cc179.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/netfilter/nf_conntrack_proto_tcp.c
Diffstat (limited to 'net/ipv6')
| -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 602ea826f0a5..9f1084b4c0e8 100644 --- a/net/ipv6/exthdrs.c +++ b/net/ipv6/exthdrs.c @@ -443,7 +443,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); |