]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: hns3: add hns3_state_init() to do state initialization
authorHuazhong Tan <tanhuazhong@huawei.com>
Fri, 27 Aug 2021 09:28:18 +0000 (17:28 +0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 27 Aug 2021 10:20:21 +0000 (11:20 +0100)
To improve the readability and maintainability, add hns3_state_init() to
initialize the state, and this new function will be used to add more state
initialization in the future.

Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

index 39d01ca026da686fa6e5a9246b36bd4413da539a..ab14beb65aaf172490f28089fc709136b7b6710c 100644 (file)
@@ -5063,6 +5063,24 @@ void hns3_cq_period_mode_init(struct hns3_nic_priv *priv,
        hns3_set_cq_period_mode(priv, rx_mode, false);
 }
 
+static void hns3_state_init(struct hnae3_handle *handle)
+{
+       struct hnae3_ae_dev *ae_dev = pci_get_drvdata(handle->pdev);
+       struct net_device *netdev = handle->kinfo.netdev;
+       struct hns3_nic_priv *priv = netdev_priv(netdev);
+
+       set_bit(HNS3_NIC_STATE_INITED, &priv->state);
+
+       if (ae_dev->dev_version >= HNAE3_DEVICE_VERSION_V3)
+               set_bit(HNAE3_PFLAG_LIMIT_PROMISC, &handle->supported_pflags);
+
+       if (test_bit(HNAE3_DEV_SUPPORT_HW_TX_CSUM_B, ae_dev->caps))
+               set_bit(HNS3_NIC_STATE_HW_TX_CSUM_ENABLE, &priv->state);
+
+       if (hnae3_ae_dev_rxd_adv_layout_supported(ae_dev))
+               set_bit(HNS3_NIC_STATE_RXD_ADV_LAYOUT_ENABLE, &priv->state);
+}
+
 static int hns3_client_init(struct hnae3_handle *handle)
 {
        struct pci_dev *pdev = handle->pdev;
@@ -5166,16 +5184,7 @@ static int hns3_client_init(struct hnae3_handle *handle)
 
        netdev->max_mtu = HNS3_MAX_MTU(ae_dev->dev_specs.max_frm_size);
 
-       if (test_bit(HNAE3_DEV_SUPPORT_HW_TX_CSUM_B, ae_dev->caps))
-               set_bit(HNS3_NIC_STATE_HW_TX_CSUM_ENABLE, &priv->state);
-
-       if (hnae3_ae_dev_rxd_adv_layout_supported(ae_dev))
-               set_bit(HNS3_NIC_STATE_RXD_ADV_LAYOUT_ENABLE, &priv->state);
-
-       set_bit(HNS3_NIC_STATE_INITED, &priv->state);
-
-       if (ae_dev->dev_version >= HNAE3_DEVICE_VERSION_V3)
-               set_bit(HNAE3_PFLAG_LIMIT_PROMISC, &handle->supported_pflags);
+       hns3_state_init(handle);
 
        ret = register_netdev(netdev);
        if (ret) {