[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20220324154932.17557-18-shenjian15@huawei.com>
Date: Thu, 24 Mar 2022 23:49:29 +0800
From: Jian Shen <shenjian15@...wei.com>
To: <davem@...emloft.net>, <kuba@...nel.org>, <andrew@...n.ch>,
<ecree.xilinx@...il.com>, <hkallweit1@...il.com>,
<alexandr.lobakin@...el.com>, <saeed@...nel.org>, <leon@...nel.org>
CC: <netdev@...r.kernel.org>, <linuxarm@...neuler.org>,
<lipeng321@...wei.com>
Subject: [RFCv5 PATCH net-next 17/20] net: use netdev_features_equal helpers
Replace the '==' and '!=' operations of features by
netdev_features_equal helpers.
Signed-off-by: Jian Shen <shenjian15@...wei.com>
---
drivers/net/ethernet/sfc/efx_common.c | 2 +-
drivers/net/ethernet/sfc/falcon/efx.c | 2 +-
net/core/dev.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/sfc/efx_common.c b/drivers/net/ethernet/sfc/efx_common.c
index d2874aad3ce7..fd6eb74b4fa6 100644
--- a/drivers/net/ethernet/sfc/efx_common.c
+++ b/drivers/net/ethernet/sfc/efx_common.c
@@ -418,7 +418,7 @@ static void efx_start_datapath(struct efx_nic *efx)
efx->net_dev->active_features);
netdev_hw_features_direct_andnot(efx->net_dev, efx->fixed_features);
netdev_active_features_direct_or(efx->net_dev, efx->fixed_features);
- if (efx->net_dev->active_features != old_features)
+ if (!netdev_active_features_equal(efx->net_dev, old_features))
netdev_features_change(efx->net_dev);
/* RX filters may also have scatter-enabled flags */
diff --git a/drivers/net/ethernet/sfc/falcon/efx.c b/drivers/net/ethernet/sfc/falcon/efx.c
index efa3054cba35..22ea294a39fa 100644
--- a/drivers/net/ethernet/sfc/falcon/efx.c
+++ b/drivers/net/ethernet/sfc/falcon/efx.c
@@ -645,7 +645,7 @@ static void ef4_start_datapath(struct ef4_nic *efx)
efx->net_dev->active_features);
netdev_hw_features_direct_andnot(efx->net_dev, efx->fixed_features);
netdev_active_features_direct_or(efx->net_dev, efx->fixed_features);
- if (efx->net_dev->active_features != old_features)
+ if (!netdev_active_features_equal(efx->net_dev, old_features))
netdev_features_change(efx->net_dev);
/* RX filters may also have scatter-enabled flags */
diff --git a/net/core/dev.c b/net/core/dev.c
index bb3c1b55cc2e..57409f97feb1 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -9613,7 +9613,7 @@ int __netdev_update_features(struct net_device *dev)
netdev_for_each_upper_dev_rcu(dev, upper, iter)
features = netdev_sync_upper_features(dev, upper, features);
- if (dev->active_features == features)
+ if (netdev_active_features_equal(dev, features))
goto sync_lower;
netdev_dbg(dev, "Features changed: %pNF -> %pNF\n",
--
2.33.0
Powered by blists - more mailing lists