diff options
| author | Stefan Agner <stefan@agner.ch> | 2016-09-16 13:17:38 -0700 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2017-03-15 18:35:47 +0100 |
| commit | 6819e8267b359913b95ccc822ac267454f39a460 (patch) | |
| tree | 13ccc08839313536152b2c46fc9d3665c9e31db4 /net/ipv6/ip6_gre.c | |
| parent | 440ef98ad687b210dca17e5c5141b24738f04922 (diff) | |
| parent | 3b60b86aec06fbae1142ccc4e55b39b529ae2a25 (diff) | |
Merge tag 'v4.1.32' into toradex_vf_4.1-next
Linux 4.1.32
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 76be7d311cc4..b1311da5d7b8 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -783,6 +783,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; |