gre: clear IFF_TX_SKB_SHARING

Jiri Benc · davem330 · commit d13b161c2c7c · 2016-02-18T14:43:48.000-05:00
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 &lt;jbenc@redhat.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
@@ -1054,8 +1054,9 @@ static const struct net_device_ops gre_tap_netdev_ops = {
 static void ipgre_tap_setup(struct net_device *dev)
 {
 	ether_setup(dev);
-	dev->netdev_ops		= &gre_tap_netdev_ops;
-	dev->priv_flags 	|= IFF_LIVE_ADDR_CHANGE;
+	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);
 }
 
diff --git 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,

Original file line number	Diff line number	Diff line change
`@@ -1054,8 +1054,9 @@ static const struct net_device_ops gre_tap_netdev_ops = {`
`1054`	`1054`	`static void ipgre_tap_setup(struct net_device *dev)`
`1055`	`1055`	`{`
`1056`	`1056`	`ether_setup(dev);`
`1057`		`- dev->netdev_ops = &gre_tap_netdev_ops;`
`1058`		`- dev->priv_flags \|= IFF_LIVE_ADDR_CHANGE;`
	`1057`	`+ dev->netdev_ops = &gre_tap_netdev_ops;`
	`1058`	`+ dev->priv_flags &= ~IFF_TX_SKB_SHARING;`
	`1059`	`+ dev->priv_flags \|= IFF_LIVE_ADDR_CHANGE;`
`1059`	`1060`	`ip_tunnel_setup(dev, gre_tap_net_id);`
`1060`	`1061`	`}`
`1061`	`1062`
Original file line number	Diff line number	Diff line change
`@@ -1512,6 +1512,7 @@ static void ip6gre_tap_setup(struct net_device *dev)`
`1512`	`1512`	`dev->destructor = ip6gre_dev_free;`
`1513`	`1513`
`1514`	`1514`	`dev->features \|= NETIF_F_NETNS_LOCAL;`
	`1515`	`+ dev->priv_flags &= ~IFF_TX_SKB_SHARING;`
`1515`	`1516`	`}`
`1516`	`1517`
`1517`	`1518`	`static int ip6gre_newlink(struct net src_net, struct net_device dev,`