diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-29 04:40:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-29 04:40:34 -0400 |
| commit | 13223cb02ccfa375f2d683d08d30db5b72264f1e (patch) | |
| tree | d3fc7d803d22bbfe03b96cf0ba38041d42c8a1c2 /drivers/net/xen-netfront.c | |
| parent | 1383bdb98c01bbd28d72336d1bf614ce79114d29 (diff) | |
| parent | 07d43ba98621f08e252a48c96b258b4d572b0257 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net/xen-netfront.c')
| -rw-r--r-- | drivers/net/xen-netfront.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index 9f102a6535c4..f67325387902 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 | ||