]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
mlxsw: use netif_is_any_bridge_port() instead of open code
authorJuhee Kang <claudiajkang@gmail.com>
Thu, 21 Jul 2022 10:26:47 +0000 (19:26 +0900)
committerDavid S. Miller <davem@davemloft.net>
Fri, 22 Jul 2022 11:35:45 +0000 (12:35 +0100)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c

index 558dede130eec75352a3c57a1748e25d37875e75..2c4443c6b964c606d5017395ce15f66c506cf039 100644 (file)
@@ -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,