aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2x_main.c
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2009-07-23 17:21:19 -0400
committerDavid S. Miller <davem@davemloft.net>2009-07-26 22:25:45 -0400
commit7d073c68a49b23b5ba2bc23c3bb5b3bcaa0b4f20 (patch)
tree2d69aef3b38807db65fc3741dc6973a98b6387b0 /drivers/net/bnx2x_main.c
parentb5eb0589937eae2d58fca17fa45ed44152e772ed (diff)
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>
Diffstat (limited to 'drivers/net/bnx2x_main.c')
-rw-r--r--drivers/net/bnx2x_main.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index c4c42b38bbbe..a2de0cd9c9f9 100644
--- 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)
9349 if (data) { 9349 if (data) {
9350 dev->features |= (NETIF_F_TSO | NETIF_F_TSO_ECN); 9350 dev->features |= (NETIF_F_TSO | NETIF_F_TSO_ECN);
9351 dev->features |= NETIF_F_TSO6; 9351 dev->features |= NETIF_F_TSO6;
9352#ifdef BCM_VLAN
9353 dev->vlan_features |= (NETIF_F_TSO | NETIF_F_TSO_ECN);
9354 dev->vlan_features |= NETIF_F_TSO6;
9355#endif
9356 } else { 9352 } else {
9357 dev->features &= ~(NETIF_F_TSO | NETIF_F_TSO_ECN); 9353 dev->features &= ~(NETIF_F_TSO | NETIF_F_TSO_ECN);
9358 dev->features &= ~NETIF_F_TSO6; 9354 dev->features &= ~NETIF_F_TSO6;
9359#ifdef BCM_VLAN
9360 dev->vlan_features &= ~(NETIF_F_TSO | NETIF_F_TSO_ECN);
9361 dev->vlan_features &= ~NETIF_F_TSO6;
9362#endif
9363 } 9355 }
9364 9356
9365 return 0; 9357 return 0;