diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-04-21 14:08:44 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-04-21 14:08:44 +0800 |
| commit | bab15641824ad77e5f3af9cc4b84308cba32aa7d (patch) | |
| tree | 6a7333fc6f30e08a7142daa5dbc1dd2bf5d08dca /net/ipv6/ip6_gre.c | |
| parent | 08562bfcb85748c69e5824fc6d1d77d5725787e4 (diff) | |
| parent | 2bf7955152a0544342fcaed28930748cc68392ae (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidlsk-v4.4-16.04-android
Conflicts:
d_canonical_path in include/linux/dcache.h
Diffstat (limited to 'net/ipv6/ip6_gre.c')
| -rw-r--r-- | net/ipv6/ip6_gre.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index e5ea177d34c6..4650c6824783 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -778,6 +778,8 @@ static inline int ip6gre_xmit_ipv4(struct sk_buff *skb, struct net_device *dev) __u32 mtu; int err; + memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); + if (!(t->parms.flags & IP6_TNL_F_IGN_ENCAP_LIMIT)) encap_limit = t->parms.encap_limit; |