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

Commit 43eb99c5 authored by Chris Leech's avatar Chris Leech Committed by James Bottomley
Browse files

[SCSI] net: reclaim 8 upper bits of the netdev->features from GSO 



Reclaim 8 upper bits of netdev->features from GSO.

Signed-off-by: default avatarChris Leech <christopher.leech@intel.com>
Signed-off-by: default avatarYi Zou <yi.zou@intel.com>
Acked-by: default avatarDavid Miller <davem@davemloft.net>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 211c738d

drivers/net/xen-netfront.c

+1 −1
Original line number Diff line number Diff line
@@ -1511,7 +1511,7 @@ static int xennet_set_tso(struct net_device *dev, u32 data) 
static void xennet_set_features(struct net_device *dev)

{

	/* Turn off all GSO bits except ROBUST. */

	dev->features &= (1 << NETIF_F_GSO_SHIFT) - 1;

	dev->features &= ~NETIF_F_GSO_MASK;

	dev->features |= NETIF_F_GSO_ROBUST;

	xennet_set_sg(dev, 0);

include/linux/netdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -652,7 +652,7 @@ struct net_device 


	/* Segmentation offload features */

#define NETIF_F_GSO_SHIFT	16

#define NETIF_F_GSO_MASK	0xffff0000

#define NETIF_F_GSO_MASK	0x00ff0000

#define NETIF_F_TSO		(SKB_GSO_TCPV4 << NETIF_F_GSO_SHIFT)

#define NETIF_F_UFO		(SKB_GSO_UDP << NETIF_F_GSO_SHIFT)

#define NETIF_F_GSO_ROBUST	(SKB_GSO_DODGY << NETIF_F_GSO_SHIFT)