diff options
| author |   Haiyang Zhang <haiyangz@microsoft.com> | 2013-07-16 23:01:20 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-07-16 23:02:24 -0700 |
| commit | f45708209dc445bac0844f6ce86e315a2ffe8a29 (patch) | |
| tree | 2b9499b4769fa8504a3ae74e96448c776c4a07fb | |
| parent | net: Fix sysfs_format_mac() code duplication. (diff) | |
| download | linux-dev-f45708209dc445bac0844f6ce86e315a2ffe8a29.tar.xz linux-dev-f45708209dc445bac0844f6ce86e315a2ffe8a29.zip | |
hyperv: Fix the NETIF_F_SG flag setting in netvsc
SG mode is not currently supported by netvsc, so remove this flag for now.
Otherwise, it will be unconditionally enabled by commit ec5f0615642
"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>
| -rw-r--r-- | drivers/net/hyperv/netvsc_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index 4dccead586be..23a0fff0df52 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -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, ðtool_ops); SET_NETDEV_DEV(net, &dev->device); |