diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-11-24 05:09:08 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-24 05:09:08 +0100 |
| commit | 69e6cdd0cf16f645be39038e5ccc9379e3923d00 (patch) | |
| tree | 3edb32b07ef37be1536f6510ec8e7caaf5acbbb8 /include/net/ip6_tunnel.h | |
| parent | Merge tag 'perf-core-for-mingo-20161114' of git://git.kernel.org/pub/scm/linu... (diff) | |
| parent | Merge tag 'nfs-for-4.9-4' of git://git.linux-nfs.org/projects/anna/linux-nfs (diff) | |
| download | linux-69e6cdd0cf16f645be39038e5ccc9379e3923d00.tar.xz linux-69e6cdd0cf16f645be39038e5ccc9379e3923d00.zip | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/net/ip6_tunnel.h')
| -rw-r--r-- | include/net/ip6_tunnel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/ip6_tunnel.h b/include/net/ip6_tunnel.h index 20ed9699fcd4..1b1cf33cbfb0 100644 --- a/include/net/ip6_tunnel.h +++ b/include/net/ip6_tunnel.h @@ -146,6 +146,7 @@ static inline void ip6tunnel_xmit(struct sock *sk, struct sk_buff *skb, { int pkt_len, err; + memset(skb->cb, 0, sizeof(struct inet6_skb_parm)); pkt_len = skb->len - skb_inner_network_offset(skb); err = ip6_local_out(dev_net(skb_dst(skb)->dev), sk, skb); if (unlikely(net_xmit_eval(err))) |