diff options
author | Jiri Benc <jbenc@redhat.com> | 2016-02-17 17:32:53 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-02-18 22:43:48 +0300 |
commit | d13b161c2c7c67401bb222c30302339285ac148e (patch) | |
tree | ac24ff6589a066e259d349d546f01b956917a5ee /net/ipv6 | |
parent | fc41cdb322a2a513efd60f81133efecd69d4f336 (diff) | |
download | linux-d13b161c2c7c67401bb222c30302339285ac148e.tar.xz |
gre: clear IFF_TX_SKB_SHARING
ether_setup sets IFF_TX_SKB_SHARING but this is not supported by gre
as it modifies the skb on xmit.
Also, clean up whitespace in ipgre_tap_setup when we're already touching it.
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/ip6_gre.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index f37f18b6b40c..a69aad1e29d1 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -1512,6 +1512,7 @@ static void ip6gre_tap_setup(struct net_device *dev) dev->destructor = ip6gre_dev_free; dev->features |= NETIF_F_NETNS_LOCAL; + dev->priv_flags &= ~IFF_TX_SKB_SHARING; } static int ip6gre_newlink(struct net *src_net, struct net_device *dev, |