net: hns3: Modify parameter type from int to bool in set_gro_en

The second parameter to the hook function set_gro_en is always passed in
true/false, so modify it's type from int to bool.

Signed-off-by: Yonglong Liu <liuyonglong@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
index e05b4926feb2186826a7eac582b4ba069c5de1e8..10f1cc2ba15790089ef4bfa967023624cf50dcb2 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
@@ -461,7 +461,7 @@ struct hnae3_ae_ops {
        bool (*get_hw_reset_stat)(struct hnae3_handle *handle);
        bool (*ae_dev_resetting)(struct hnae3_handle *handle);
        unsigned long (*ae_dev_reset_cnt)(struct hnae3_handle *handle);
-       int (*set_gro_en)(struct hnae3_handle *handle, int enable);
+       int (*set_gro_en)(struct hnae3_handle *handle, bool enable);
        u16 (*get_global_queue_id)(struct hnae3_handle *handle, u16 queue_id);
        void (*set_timer_task)(struct hnae3_handle *handle, bool enable);
        int (*mac_connect_phy)(struct hnae3_handle *handle);

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index bc571b3d8ddcb4d33f728eea715978cb48ac95bc..db06d36d408f0061ac9fa9689967cfab3389dc33 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -1349,6 +1349,7 @@ static int hns3_nic_set_features(struct net_device *netdev,
        netdev_features_t changed = netdev->features ^ features;
        struct hns3_nic_priv *priv = netdev_priv(netdev);
        struct hnae3_handle *h = priv->ae_handle;
+       bool enable;
        int ret;
 
        if (changed & (NETIF_F_TSO | NETIF_F_TSO6)) {
@@ -1359,38 +1360,29 @@ static int hns3_nic_set_features(struct net_device *netdev,
        }
 
        if (changed & (NETIF_F_GRO_HW) && h->ae_algo->ops->set_gro_en) {
-               if (features & NETIF_F_GRO_HW)
-                       ret = h->ae_algo->ops->set_gro_en(h, true);
-               else
-                       ret = h->ae_algo->ops->set_gro_en(h, false);
+               enable = !!(features & NETIF_F_GRO_HW);
+               ret = h->ae_algo->ops->set_gro_en(h, enable);
                if (ret)
                        return ret;
        }
 
        if ((changed & NETIF_F_HW_VLAN_CTAG_FILTER) &&
            h->ae_algo->ops->enable_vlan_filter) {
-               if (features & NETIF_F_HW_VLAN_CTAG_FILTER)
-                       h->ae_algo->ops->enable_vlan_filter(h, true);
-               else
-                       h->ae_algo->ops->enable_vlan_filter(h, false);
+               enable = !!(features & NETIF_F_HW_VLAN_CTAG_FILTER);
+               h->ae_algo->ops->enable_vlan_filter(h, enable);
        }
 
        if ((changed & NETIF_F_HW_VLAN_CTAG_RX) &&
            h->ae_algo->ops->enable_hw_strip_rxvtag) {
-               if (features & NETIF_F_HW_VLAN_CTAG_RX)
-                       ret = h->ae_algo->ops->enable_hw_strip_rxvtag(h, true);
-               else
-                       ret = h->ae_algo->ops->enable_hw_strip_rxvtag(h, false);
-
+               enable = !!(features & NETIF_F_HW_VLAN_CTAG_RX);
+               ret = h->ae_algo->ops->enable_hw_strip_rxvtag(h, enable);
                if (ret)
                        return ret;
        }
 
        if ((changed & NETIF_F_NTUPLE) && h->ae_algo->ops->enable_fd) {
-               if (features & NETIF_F_NTUPLE)
-                       h->ae_algo->ops->enable_fd(h, true);
-               else
-                       h->ae_algo->ops->enable_fd(h, false);
+               enable = !!(features & NETIF_F_NTUPLE);
+               h->ae_algo->ops->enable_fd(h, enable);
        }
 
        netdev->features = features;

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 52fc57284be87d59ca2b8396d6c9ac3f8aaf9de3..9630bbce5932dbb3dec9d0e0ae61bc0960157490 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -7989,7 +7989,7 @@ static void hclge_get_link_mode(struct hnae3_handle *handle,
        }
 }
 
-static int hclge_gro_en(struct hnae3_handle *handle, int enable)
+static int hclge_gro_en(struct hnae3_handle *handle, bool enable)
 {
        struct hclge_vport *vport = hclge_get_vport(handle);
        struct hclge_dev *hdev = vport->back;

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
index b9cdbd5dd6cb50d8f3f1391b0a6b3910ac124032..bc2f29e67280cd35460b7057ec6255b851db9411 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
@@ -2550,7 +2550,7 @@ void hclgevf_update_speed_duplex(struct hclgevf_dev *hdev, u32 speed,
        hdev->hw.mac.duplex = duplex;
 }
 
-static int hclgevf_gro_en(struct hnae3_handle *handle, int enable)
+static int hclgevf_gro_en(struct hnae3_handle *handle, bool enable)
 {
        struct hclgevf_dev *hdev = hclgevf_ae_get_hdev(handle);