bnx2x: Dont update vlan_features in bnx2x_set_tso()

Patrick said : "vlan_features doesn't need to be updated, the resulting
dev->features of the VLAN device is computed as the intersection of
dev->features and dev->vlan_features."

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index c4c42b38bbbe911f193ae50f4c1a7c398749ba82..a2de0cd9c9f915ace729d60174726d51fe847855 100644 (file)
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -9349,17 +9349,9 @@ static int bnx2x_set_tso(struct net_device *dev, u32 data)
        if (data) {
                dev->features |= (NETIF_F_TSO | NETIF_F_TSO_ECN);
                dev->features |= NETIF_F_TSO6;
-#ifdef BCM_VLAN
-               dev->vlan_features |= (NETIF_F_TSO | NETIF_F_TSO_ECN);
-               dev->vlan_features |= NETIF_F_TSO6;
-#endif
        } else {
                dev->features &= ~(NETIF_F_TSO | NETIF_F_TSO_ECN);
                dev->features &= ~NETIF_F_TSO6;
-#ifdef BCM_VLAN
-               dev->vlan_features &= ~(NETIF_F_TSO | NETIF_F_TSO_ECN);
-               dev->vlan_features &= ~NETIF_F_TSO6;
-#endif
        }
 
        return 0;