diff options
| author |   Eric Dumazet <eric.dumazet@gmail.com> | 2009-07-23 21:21:19 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-07-26 19:25:45 -0700 |
| commit | 7d073c68a49b23b5ba2bc23c3bb5b3bcaa0b4f20 (patch) | |
| tree | 2d69aef3b38807db65fc3741dc6973a98b6387b0 | |
| parent | net: deprecate print_mac (diff) | |
| download | linux-dev-7d073c68a49b23b5ba2bc23c3bb5b3bcaa0b4f20.tar.xz linux-dev-7d073c68a49b23b5ba2bc23c3bb5b3bcaa0b4f20.zip | |
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>
| -rw-r--r-- | drivers/net/bnx2x_main.c | 8 |
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) 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; |