diff options
Diffstat (limited to 'drivers/net/ethernet/atheros/atlx/atlx.c')
| -rw-r--r-- | drivers/net/ethernet/atheros/atlx/atlx.c | 10 | 
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/atheros/atlx/atlx.c b/drivers/net/ethernet/atheros/atlx/atlx.c index f82eb169946..46a622cceee 100644 --- a/drivers/net/ethernet/atheros/atlx/atlx.c +++ b/drivers/net/ethernet/atheros/atlx/atlx.c @@ -220,7 +220,7 @@ static void atlx_link_chg_task(struct work_struct *work)  static void __atlx_vlan_mode(netdev_features_t features, u32 *ctrl)  { -	if (features & NETIF_F_HW_VLAN_RX) { +	if (features & NETIF_F_HW_VLAN_CTAG_RX) {  		/* enable VLAN tag insert/strip */  		*ctrl |= MAC_CTRL_RMV_VLAN;  	} else { @@ -257,10 +257,10 @@ static netdev_features_t atlx_fix_features(struct net_device *netdev,  	 * 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_RX) -		features |= NETIF_F_HW_VLAN_TX; +	if (features & NETIF_F_HW_VLAN_CTAG_RX) +		features |= NETIF_F_HW_VLAN_CTAG_TX;  	else -		features &= ~NETIF_F_HW_VLAN_TX; +		features &= ~NETIF_F_HW_VLAN_CTAG_TX;  	return features;  } @@ -270,7 +270,7 @@ static int atlx_set_features(struct net_device *netdev,  {  	netdev_features_t changed = netdev->features ^ features; -	if (changed & NETIF_F_HW_VLAN_RX) +	if (changed & NETIF_F_HW_VLAN_CTAG_RX)  		atlx_vlan_mode(netdev, features);  	return 0;  |