[PATCH net-next 1/2] mlxsw: use netif_is_any_bridge_port() instead of open code

[PATCH net-next 1/2] mlxsw: use netif_is_any_bridge_port() instead of open code

[Juhee Kang]

The open code which is netif_is_bridge_port() || netif_is_ovs_port() is
defined as a new helper function on netdev.h like netif_is_any_bridge_port
that can check both IFF flags in 1 go. So use netif_is_any_bridge_port()
function instead of open code. This patch doesn't change logic.

Signed-off-by: Juhee Kang <claudiajkang@gmail.com>
---
 drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index 23d526f13f1c..3a16c24154e1 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -8590,9 +8590,7 @@ static int mlxsw_sp_inetaddr_port_event(struct net_device *port_dev,
 					unsigned long event,
 					struct netlink_ext_ack *extack)
 {
-	if (netif_is_bridge_port(port_dev) ||
-	    netif_is_lag_port(port_dev) ||
-	    netif_is_ovs_port(port_dev))
+	if (netif_is_any_bridge_port(port_dev) || netif_is_lag_port(port_dev))
 		return 0;

 	return mlxsw_sp_inetaddr_port_vlan_event(port_dev, port_dev, event,
--
2.34.1

[PATCH net-next 2/2] net: marvell: prestera: use netif_is_any_bridge_port instead of open code

[Juhee Kang]

The open code which is netif_is_bridge_port() || netif_is_ovs_port() is
defined as a new helper function on netdev.h like netif_is_any_bridge_port
that can check both IFF flags in 1 go. So use netif_is_any_bridge_port()
function instead of open code. This patch doesn't change logic.

Signed-off-by: Juhee Kang <claudiajkang@gmail.com>
---
 drivers/net/ethernet/marvell/prestera/prestera_router.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/marvell/prestera/prestera_router.c b/drivers/net/ethernet/marvell/prestera/prestera_router.c
index 3c8116f16b4d..58f4e44d5ad7 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_router.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_router.c
@@ -389,8 +389,8 @@ static int __prestera_inetaddr_event(struct prestera_switch *sw,
 				     unsigned long event,
 				     struct netlink_ext_ack *extack)
 {
-	if (!prestera_netdev_check(dev) || netif_is_bridge_port(dev) ||
-	    netif_is_lag_port(dev) || netif_is_ovs_port(dev))
+	if (!prestera_netdev_check(dev) || netif_is_any_bridge_port(dev) ||
+	    netif_is_lag_port(dev))
 		return 0;

 	return __prestera_inetaddr_port_event(dev, event, extack);
--
2.34.1

Re: [PATCH net-next 1/2] mlxsw: use netif_is_any_bridge_port() instead of open code

[Ido Schimmel]

On Thu, Jul 21, 2022 at 07:26:47PM +0900, Juhee Kang wrote:
> The open code which is netif_is_bridge_port() || netif_is_ovs_port() is
> defined as a new helper function on netdev.h like netif_is_any_bridge_port
> that can check both IFF flags in 1 go. So use netif_is_any_bridge_port()
> function instead of open code. This patch doesn't change logic.
> 
> Signed-off-by: Juhee Kang <claudiajkang@gmail.com>

Reviewed-by: Ido Schimmel <idosch@nvidia.com>

Re: [PATCH net-next 1/2] mlxsw: use netif_is_any_bridge_port() instead of open code

[Jakub Kicinski]

On Thu, 21 Jul 2022 19:26:47 +0900 Juhee Kang wrote:
> The open code which is netif_is_bridge_port() || netif_is_ovs_port() is
> defined as a new helper function on netdev.h like netif_is_any_bridge_port
> that can check both IFF flags in 1 go. So use netif_is_any_bridge_port()
> function instead of open code. This patch doesn't change logic.

Appears applied:

c497885e3044 ("net: marvell: prestera: use netif_is_any_bridge_port instead of open code")
59ad24714b7b ("mlxsw: use netif_is_any_bridge_port() instead of open code")

Thanks!