diff options
| author | Patrick McHardy <kaber@trash.net> | 2009-06-11 10:00:49 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2009-06-11 10:00:49 -0400 |
| commit | 36432dae73cf2c90a59b39c8df9fd8219272b005 (patch) | |
| tree | 660b9104305a809ec4fdeb295ca13d6e90790ecc /include/net/inet6_hashtables.h | |
| parent | 440f0d588555892601cfe511728a0fc0c8204063 (diff) | |
| parent | bb400801c2f40bbd9a688818323ad09abfc4e581 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
Diffstat (limited to 'include/net/inet6_hashtables.h')
| -rw-r--r-- | include/net/inet6_hashtables.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/inet6_hashtables.h b/include/net/inet6_hashtables.h index f74665d7bea8..22c73a77cd99 100644 --- a/include/net/inet6_hashtables.h +++ b/include/net/inet6_hashtables.h | |||
| @@ -100,7 +100,7 @@ static inline struct sock *__inet6_lookup_skb(struct inet_hashinfo *hashinfo, | |||
| 100 | 100 | ||
| 101 | if (unlikely(sk = skb_steal_sock(skb))) | 101 | if (unlikely(sk = skb_steal_sock(skb))) |
| 102 | return sk; | 102 | return sk; |
| 103 | else return __inet6_lookup(dev_net(skb->dst->dev), hashinfo, | 103 | else return __inet6_lookup(dev_net(skb_dst(skb)->dev), hashinfo, |
| 104 | &ipv6_hdr(skb)->saddr, sport, | 104 | &ipv6_hdr(skb)->saddr, sport, |
| 105 | &ipv6_hdr(skb)->daddr, ntohs(dport), | 105 | &ipv6_hdr(skb)->daddr, ntohs(dport), |
| 106 | inet6_iif(skb)); | 106 | inet6_iif(skb)); |