|
@@ -279,11 +279,16 @@ static u32 __ethtool_get_flags(struct net_device *dev)
|
|
|
{
|
|
|
u32 flags = 0;
|
|
|
|
|
|
- if (dev->features & NETIF_F_LRO) flags |= ETH_FLAG_LRO;
|
|
|
- if (dev->features & NETIF_F_HW_VLAN_CTAG_RX) flags |= ETH_FLAG_RXVLAN;
|
|
|
- if (dev->features & NETIF_F_HW_VLAN_CTAG_TX) flags |= ETH_FLAG_TXVLAN;
|
|
|
- if (dev->features & NETIF_F_NTUPLE) flags |= ETH_FLAG_NTUPLE;
|
|
|
- if (dev->features & NETIF_F_RXHASH) flags |= ETH_FLAG_RXHASH;
|
|
|
+ if (dev->features & NETIF_F_LRO)
|
|
|
+ flags |= ETH_FLAG_LRO;
|
|
|
+ if (dev->features & NETIF_F_HW_VLAN_CTAG_RX)
|
|
|
+ flags |= ETH_FLAG_RXVLAN;
|
|
|
+ if (dev->features & NETIF_F_HW_VLAN_CTAG_TX)
|
|
|
+ flags |= ETH_FLAG_TXVLAN;
|
|
|
+ if (dev->features & NETIF_F_NTUPLE)
|
|
|
+ flags |= ETH_FLAG_NTUPLE;
|
|
|
+ if (dev->features & NETIF_F_RXHASH)
|
|
|
+ flags |= ETH_FLAG_RXHASH;
|
|
|
|
|
|
return flags;
|
|
|
}
|
|
@@ -295,11 +300,16 @@ static int __ethtool_set_flags(struct net_device *dev, u32 data)
|
|
|
if (data & ~ETH_ALL_FLAGS)
|
|
|
return -EINVAL;
|
|
|
|
|
|
- if (data & ETH_FLAG_LRO) features |= NETIF_F_LRO;
|
|
|
- if (data & ETH_FLAG_RXVLAN) features |= NETIF_F_HW_VLAN_CTAG_RX;
|
|
|
- if (data & ETH_FLAG_TXVLAN) features |= NETIF_F_HW_VLAN_CTAG_TX;
|
|
|
- if (data & ETH_FLAG_NTUPLE) features |= NETIF_F_NTUPLE;
|
|
|
- if (data & ETH_FLAG_RXHASH) features |= NETIF_F_RXHASH;
|
|
|
+ if (data & ETH_FLAG_LRO)
|
|
|
+ features |= NETIF_F_LRO;
|
|
|
+ if (data & ETH_FLAG_RXVLAN)
|
|
|
+ features |= NETIF_F_HW_VLAN_CTAG_RX;
|
|
|
+ if (data & ETH_FLAG_TXVLAN)
|
|
|
+ features |= NETIF_F_HW_VLAN_CTAG_TX;
|
|
|
+ if (data & ETH_FLAG_NTUPLE)
|
|
|
+ features |= NETIF_F_NTUPLE;
|
|
|
+ if (data & ETH_FLAG_RXHASH)
|
|
|
+ features |= NETIF_F_RXHASH;
|
|
|
|
|
|
/* allow changing only bits set in hw_features */
|
|
|
changed = (features ^ dev->features) & ETH_ALL_FEATURES;
|