diff options
-rw-r--r-- | drivers/net/xen-netfront.c | 2 | ||||
-rw-r--r-- | include/linux/netdevice.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index cd6184ee08ee..2ce536fcd209 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c | |||
@@ -1511,7 +1511,7 @@ static int xennet_set_tso(struct net_device *dev, u32 data) | |||
1511 | static void xennet_set_features(struct net_device *dev) | 1511 | static void xennet_set_features(struct net_device *dev) |
1512 | { | 1512 | { |
1513 | /* Turn off all GSO bits except ROBUST. */ | 1513 | /* Turn off all GSO bits except ROBUST. */ |
1514 | dev->features &= (1 << NETIF_F_GSO_SHIFT) - 1; | 1514 | dev->features &= ~NETIF_F_GSO_MASK; |
1515 | dev->features |= NETIF_F_GSO_ROBUST; | 1515 | dev->features |= NETIF_F_GSO_ROBUST; |
1516 | xennet_set_sg(dev, 0); | 1516 | xennet_set_sg(dev, 0); |
1517 | 1517 | ||
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index ec54785d34f9..c8238d9ba376 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -652,7 +652,7 @@ struct net_device | |||
652 | 652 | ||
653 | /* Segmentation offload features */ | 653 | /* Segmentation offload features */ |
654 | #define NETIF_F_GSO_SHIFT 16 | 654 | #define NETIF_F_GSO_SHIFT 16 |
655 | #define NETIF_F_GSO_MASK 0xffff0000 | 655 | #define NETIF_F_GSO_MASK 0x00ff0000 |
656 | #define NETIF_F_TSO (SKB_GSO_TCPV4 << NETIF_F_GSO_SHIFT) | 656 | #define NETIF_F_TSO (SKB_GSO_TCPV4 << NETIF_F_GSO_SHIFT) |
657 | #define NETIF_F_UFO (SKB_GSO_UDP << NETIF_F_GSO_SHIFT) | 657 | #define NETIF_F_UFO (SKB_GSO_UDP << NETIF_F_GSO_SHIFT) |
658 | #define NETIF_F_GSO_ROBUST (SKB_GSO_DODGY << NETIF_F_GSO_SHIFT) | 658 | #define NETIF_F_GSO_ROBUST (SKB_GSO_DODGY << NETIF_F_GSO_SHIFT) |