]> git.baikalelectronics.ru Git - kernel.git/commitdiff
hyperv: Fix the NETIF_F_SG flag setting in netvsc
authorHaiyang Zhang <haiyangz@microsoft.com>
Wed, 17 Jul 2013 06:01:20 +0000 (23:01 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 17 Jul 2013 06:02:24 +0000 (23:02 -0700)
SG mode is not currently supported by netvsc, so remove this flag for now.
Otherwise, it will be unconditionally enabled by commit 0568564d1b1
    "Kill link between CSUM and SG features"
Previously, the SG feature is disabled because CSUM is not set here.

Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Reviewed-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/hyperv/netvsc_drv.c

index 4dccead586bee57a076be015478809ea82e7157e..23a0fff0df52eaf6cc3a9992e9ec45350a1c9084 100644 (file)
@@ -431,8 +431,8 @@ static int netvsc_probe(struct hv_device *dev,
        net->netdev_ops = &device_ops;
 
        /* TODO: Add GSO and Checksum offload */
-       net->hw_features = NETIF_F_SG;
-       net->features = NETIF_F_SG | NETIF_F_HW_VLAN_CTAG_TX;
+       net->hw_features = 0;
+       net->features = NETIF_F_HW_VLAN_CTAG_TX;
 
        SET_ETHTOOL_OPS(net, &ethtool_ops);
        SET_NETDEV_DEV(net, &dev->device);