aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> 2013-12-05 18:11:23 -0500
committerGravatar David S. Miller <davem@davemloft.net> 2013-12-05 20:33:46 -0500
commit4be1028e9f99011e34dfe405d572592610776c74 (patch)
tree7158d81556d12c5d0af1bbefa866b1f63321b63e
parentqlge: Fix ethtool statistics (diff)
downloadlinux-4be1028e9f99011e34dfe405d572592610776c74.tar.gz
linux-4be1028e9f99011e34dfe405d572592610776c74.tar.bz2
linux-4be1028e9f99011e34dfe405d572592610776c74.zip
qlge: Allow enable/disable rx/tx vlan acceleration independently
o Fix the driver to allow user to enable/disable rx/tx vlan acceleration independently. For example: ethtool -K ethX rxvlan on/off ethtool -K ethX txvlan on/off Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/qlogic/qlge/qlge_main.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
index a245dc18d769..449f506d2e8f 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c
@@ -2376,14 +2376,6 @@ static netdev_features_t qlge_fix_features(struct net_device *ndev,
netdev_features_t features)
{
int err;
- /*
- * Since there is no support for separate rx/tx vlan accel
- * enable/disable make sure tx flag is always in same state as rx.
- */
- if (features & NETIF_F_HW_VLAN_CTAG_RX)
- features |= NETIF_F_HW_VLAN_CTAG_TX;
- else
- features &= ~NETIF_F_HW_VLAN_CTAG_TX;
/* Update the behavior of vlan accel in the adapter */
err = qlge_update_hw_vlan_features(ndev, features);