From 433f97e2fce470ca2298750943afd417dcf50b67 Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Fri, 27 Feb 2009 14:06:43 -0800 Subject: [PATCH] --- yaml --- r: 136299 b: refs/heads/master c: 43eb99c5b349b188f82725652f3d1018c619d682 h: refs/heads/master i: 136297: 3cb9b8387bcf13aa3239298cabde901425b1938e 136295: 0a90ca27dd736236f8cc43a2bd9ce017017a9b0a v: v3 --- [refs] | 2 +- trunk/drivers/net/xen-netfront.c | 2 +- trunk/include/linux/netdevice.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 27c9b8b0a1a7..6ef9803a477e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 211c738d86f3f423f1b218ab3a356c9538e38047 +refs/heads/master: 43eb99c5b349b188f82725652f3d1018c619d682 diff --git a/trunk/drivers/net/xen-netfront.c b/trunk/drivers/net/xen-netfront.c index cd6184ee08ee..2ce536fcd209 100644 --- a/trunk/drivers/net/xen-netfront.c +++ b/trunk/drivers/net/xen-netfront.c @@ -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); diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index ec54785d34f9..c8238d9ba376 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -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)