Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d13b161c authored by Jiri Benc's avatar Jiri Benc Committed by David S. Miller
Browse files

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: default avatarJiri Benc <jbenc@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fc41cdb3

net/ipv4/ip_gre.c

+3 −2
Original line number Diff line number Diff line
@@ -1055,6 +1055,7 @@ static void ipgre_tap_setup(struct net_device *dev) 
{

	ether_setup(dev);

	dev->netdev_ops	= &gre_tap_netdev_ops;

	dev->priv_flags &= ~IFF_TX_SKB_SHARING;

	dev->priv_flags	|= IFF_LIVE_ADDR_CHANGE;

	ip_tunnel_setup(dev, gre_tap_net_id);

}

net/ipv6/ip6_gre.c

+1 −0
Original line number Diff line number Diff line
@@ -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,