Revert "hv_netvsc: cleanup netdev feature flags for netvsc"

BugLink: http://bugs.launchpad.net/bugs/1583357
This reverts commit 3814a7372ea2f325721c7ae5421f6c0fcf6d06ca.

Favor upstream

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>

diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index c72e5b83afdbc9ec509106ed5cb70bbc0539372a..abbaf1de0265f128fc995fcfcba6b0a23567aea9 100644 (file)
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -42,12 +42,6 @@
 
 
 #define RING_SIZE_MIN 64
-#define LINKCHANGE_INT (2 * HZ)
-#define NETVSC_HW_FEATURES     (NETIF_F_RXCSUM | \
-                                NETIF_F_SG | \
-                                NETIF_F_TSO | \
-                                NETIF_F_TSO6 | \
-                                NETIF_F_HW_CSUM)
 static int ring_size = 128;
 module_param(ring_size, int, S_IRUGO);
 MODULE_PARM_DESC(ring_size, "Ring buffer size (# of pages)");
@@ -1086,8 +1080,10 @@ static int netvsc_probe(struct hv_device *dev,
 
        net->netdev_ops = &device_ops;
 
-       net->hw_features = NETVSC_HW_FEATURES;
-       net->features = NETVSC_HW_FEATURES | NETIF_F_HW_VLAN_CTAG_TX;
+       net->hw_features = NETIF_F_RXCSUM | NETIF_F_SG | NETIF_F_IP_CSUM |
+                               NETIF_F_TSO;
+       net->features = NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_SG | NETIF_F_RXCSUM |
+                       NETIF_F_IP_CSUM | NETIF_F_TSO;
 
        net->ethtool_ops = &ethtool_ops;
        SET_NETDEV_DEV(net, &dev->device);