diff options
| author | Haiyang Zhang <haiyangz@microsoft.com> | 2013-07-16 23:01:20 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-28 16:30:04 -0700 |
| commit | 98bec4a114dfd772390a07735606109447481872 (patch) | |
| tree | 8548697f306eee15430e715d583ea1eb2672e4b9 /drivers/net | |
| parent | e0ca176c17745ac3e0c5a9969aba3c983e6c69c5 (diff) | |
| download | linux-3.10-98bec4a114dfd772390a07735606109447481872.tar.gz linux-3.10-98bec4a114dfd772390a07735606109447481872.tar.bz2 linux-3.10-98bec4a114dfd772390a07735606109447481872.zip | |
hyperv: Fix the NETIF_F_SG flag setting in netvsc
[ Upstream commit f45708209dc445bac0844f6ce86e315a2ffe8a29 ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/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 4dccead586b..23a0fff0df5 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); |