diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-05 17:21:11 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-05 17:21:11 -0400 |
| commit | 9d9305949778c41b92d4394a2f2a6bcdb1c41a9c (patch) | |
| tree | d49d536ae8156ad9989dc7b26e3897f21e549b02 /include/net | |
| parent | 738faca34335cd1d5d87fa7c58703139c7fa15bd (diff) | |
| parent | 96120d86fe302c006259baee9061eea9e1b9e486 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ip_vs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 30b49ed72f0..4d1b71ae82b 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h | |||
| @@ -52,7 +52,7 @@ static inline struct net *skb_net(const struct sk_buff *skb) | |||
| 52 | */ | 52 | */ |
| 53 | if (likely(skb->dev && skb->dev->nd_net)) | 53 | if (likely(skb->dev && skb->dev->nd_net)) |
| 54 | return dev_net(skb->dev); | 54 | return dev_net(skb->dev); |
| 55 | if (skb_dst(skb)->dev) | 55 | if (skb_dst(skb) && skb_dst(skb)->dev) |
| 56 | return dev_net(skb_dst(skb)->dev); | 56 | return dev_net(skb_dst(skb)->dev); |
| 57 | WARN(skb->sk, "Maybe skb_sknet should be used in %s() at line:%d\n", | 57 | WARN(skb->sk, "Maybe skb_sknet should be used in %s() at line:%d\n", |
| 58 | __func__, __LINE__); | 58 | __func__, __LINE__); |