diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-11-16 10:16:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-16 10:16:28 +0100 |
| commit | 0acbc7aa4713b450ff46f9c9f6ce0060ea6947b1 (patch) | |
| tree | 480508a78b7d9e9c0da0ffbd33b40e0b4e076a16 /include/linux/ipv6.h | |
| parent | 353c50ebe329daaf2c94dc41c1c481cbba2a31fd (diff) | |
| parent | 81bcfe5e48f9b8c42cf547f1c74c7f60c44c34c8 (diff) | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/ipv6.h')
| -rw-r--r-- | include/linux/ipv6.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index ca1ad9ebbc92..a0649973ee5b 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -149,7 +149,7 @@ static inline bool inet6_exact_dif_match(struct net *net, struct sk_buff *skb) { #if defined(CONFIG_NET_L3_MASTER_DEV) if (!net->ipv4.sysctl_tcp_l3mdev_accept && - ipv6_l3mdev_skb(IP6CB(skb)->flags)) + skb && ipv6_l3mdev_skb(IP6CB(skb)->flags)) return true; #endif return false; |