cxgb4/cxgb4vf: Fix up netdev->hw_features
Subsystems (4)
PATCH 1/1 cxgb4/cxgb4vf: Fix up netdev->hw_features
GRO is done by cxgb4/cxgb4vf. Hence set NETIF_F_GRO flag for both cxgb4/cxgb4vf.
Cleaned up VLAN netdev features in cxgb4vf. Also fixed NETIF_F_HIGHDMA being set unconditionally for vlan netdev features.
Signed-off-by Arjun Vynipadath <[email protected]>
Signed-off-by Vishal Kulkarni <[email protected]>
--- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 4 ++-- drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 15 +++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-)
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +2 -2
@@ -5303,7 +5303,7 @@ static void free_some_resources(struct adapter *adapter)#define TSO_FLAGS (NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN)#define VLAN_FEAT (NETIF_F_SG | NETIF_F_IP_CSUM | TSO_FLAGS | \ - NETIF_F_IPV6_CSUM | NETIF_F_HIGHDMA) + NETIF_F_GRO | NETIF_F_IPV6_CSUM | NETIF_F_HIGHDMA)#define SEGMENT_SIZE 128static int t4_get_chip_type (struct adapter *adap,int ver)
@@ -5710,7 +5710,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) netdev->hw_features =NETIF_F_SG |TSO_FLAGS |NETIF_F_IP_CSUM |NETIF_F_IPV6_CSUM | -NETIF_F_RXCSUM |NETIF_F_RXHASH | +NETIF_F_RXCSUM |NETIF_F_RXHASH |NETIF_F_GRO |NETIF_F_HW_VLAN_CTAG_TX |NETIF_F_HW_VLAN_CTAG_RX |NETIF_F_HW_TC ;
drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c +7 -8
@@ -1932,6 +1932,8 @@ static void cxgb4vf_get_wol(struct net_device *dev,* TCP Segmentation Offload flags which we support. */ #define TSO_FLAGS (NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN) +#define VLAN_FEAT (NETIF_F_SG | NETIF_F_IP_CSUM | TSO_FLAGS | \ + NETIF_F_GRO | NETIF_F_IPV6_CSUM | NETIF_F_HIGHDMA)static const struct ethtool_ops cxgb4vf_ethtool_ops = { .get_link_ksettings = cxgb4vf_get_link_ksettings,
@@ -3141,16 +3143,13 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev,netif_carrier_off (netdev); netdev->irq = pdev->irq; - netdev->hw_features =NETIF_F_SG |TSO_FLAGS | -NETIF_F_IP_CSUM |NETIF_F_IPV6_CSUM | -NETIF_F_HW_VLAN_CTAG_RX |NETIF_F_RXCSUM ; - netdev->vlan_features =NETIF_F_SG |TSO_FLAGS | -NETIF_F_IP_CSUM |NETIF_F_IPV6_CSUM | -NETIF_F_HIGHDMA ; - netdev->features = netdev->hw_features | -NETIF_F_HW_VLAN_CTAG_TX ; + netdev->hw_features =NETIF_F_SG |TSO_FLAGS |NETIF_F_GRO | +NETIF_F_IP_CSUM |NETIF_F_IPV6_CSUM |NETIF_F_RXCSUM | +NETIF_F_HW_VLAN_CTAG_TX |NETIF_F_HW_VLAN_CTAG_RX ; + netdev->features = netdev->hw_features;if (pci_using_dac) netdev->features |=NETIF_F_HIGHDMA ; + netdev->vlan_features = netdev->features &VLAN_FEAT ; netdev->priv_flags |=IFF_UNICAST_FLT ; netdev->min_mtu =81 ;
Signature · 1 line
2.9.5
From: Arjun Vynipadath <[email protected]>
Date: Thu, 28 Feb 2019 15:06:54 +0530
Quoted 8 lines
GRO is done by cxgb4/cxgb4vf. Hence set
NETIF_F_GROflag for both cxgb4/cxgb4vf.
Cleaned up VLAN netdev features in cxgb4vf. Also fixedNETIF_F_HIGHDMAbeing set unconditionally for vlan netdev features.Signed-off-by Arjun Vynipadath <[email protected]>Signed-off-by Vishal Kulkarni <[email protected]>
Applied.