[Linuxarm] Re: [RFCv2 PATCH net-next 100/167] net: ibm: use netdev feature helpers

在 2021/9/23 19:10, moyufeng 写道:

On 2021/9/22 22:57, Jian Shen wrote:

...

Use netdev_feature_xxx helpers to replace the logical operation for netdev features.

Signed-off-by: Jian Shen shenjian15@huawei.com

drivers/net/ethernet/ibm/ehea/ehea_main.c | 22 ++++--- drivers/net/ethernet/ibm/emac/core.c | 7 ++- drivers/net/ethernet/ibm/ibmveth.c | 70 ++++++++++++++--------- drivers/net/ethernet/ibm/ibmvnic.c | 62 +++++++++++++------- 4 files changed, 104 insertions(+), 57 deletions(-)

diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c index d5df131b183c..b7ca1c6f4ea6 100644 --- a/drivers/net/ethernet/ibm/ehea/ehea_main.c +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c @@ -2991,14 +2991,20 @@ static struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter, dev->netdev_ops = &ehea_netdev_ops; ehea_set_ethtool_ops(dev);

• dev->hw_features = NETIF_F_SG | NETIF_F_TSO |

•       NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_CTAG_TX;
  

• dev->features = NETIF_F_SG | NETIF_F_TSO |

•       NETIF_F_HIGHDMA | NETIF_F_IP_CSUM |
  

•       NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX |
  

•       NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_RXCSUM;
  

• dev->vlan_features = NETIF_F_SG | NETIF_F_TSO | NETIF_F_HIGHDMA |

• 	NETIF_F_IP_CSUM;
  

• netdev_feature_zero(&dev->hw_features);
• netdev_feature_set_bits(NETIF_F_SG | NETIF_F_TSO |

• 		NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_CTAG_TX,
  

• 		&dev->hw_features);
  

• netdev_feature_zero(&dev->features);
• netdev_feature_set_bits(NETIF_F_SG | NETIF_F_TSO |

• 		NETIF_F_HIGHDMA | NETIF_F_IP_CSUM |
  

• 		NETIF_F_HW_VLAN_CTAG_TX |
  

• 		NETIF_F_HW_VLAN_CTAG_RX |
  

• 		NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_RXCSUM,
  

• 		&dev->features);
  

• netdev_feature_zero(&dev->vlan_features);
• netdev_feature_set_bits(NETIF_F_SG | NETIF_F_TSO | NETIF_F_HIGHDMA |

• 		NETIF_F_IP_CSUM, &dev->hw_features);
  

&dev->hw_features -> &dev->vlan_features ?

OK, will fix it, thanks!

...

dev->watchdog_timeo = EHEA_WATCH_DOG_TIMEOUT;

/* MTU range: 68 - 9022 */ diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c index 664a91af662d..ff175e7c5b90 100644 --- a/drivers/net/ethernet/ibm/emac/core.c +++ b/drivers/net/ethernet/ibm/emac/core.c @@ -3170,8 +3170,11 @@ static int emac_probe(struct platform_device *ofdev) goto err_detach_tah;

if (dev->tah_dev) {

• ndev->hw_features = NETIF_F_IP_CSUM | NETIF_F_SG;
  

• ndev->features |= ndev->hw_features | NETIF_F_RXCSUM;
  

• netdev_feature_zero(&ndev->hw_features);
  

• netdev_feature_set_bits(NETIF_F_IP_CSUM | NETIF_F_SG,
  

• 			&ndev->hw_features);
  

• netdev_feature_copy(&ndev->features, ndev->hw_features);
  

• netdev_feature_set_bit(NETIF_F_RXCSUM_BIT, &ndev->features);
  

  } ndev->watchdog_timeo = 5 * HZ; if (emac_phy_supports_gige(dev->phy_mode)) {

diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c index 1afffcea1c02..7b9246dea6e8 100644 --- a/drivers/net/ethernet/ibm/ibmveth.c +++ b/drivers/net/ethernet/ibm/ibmveth.c @@ -761,8 +761,8 @@ static void ibmveth_fix_features(struct net_device *dev, * checksummed. */

.