net: bridge: use netif_is_bridge_port()

Replace the br_port_exists() macro with its twin from netdevice.h

CC: Roopa Prabhu <roopa@cumulusnetworks.com>
CC: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Acked-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 41f0a696a65f4362a4e1507024dcff0ce1a9208e..4a9aaa3fac8fdfa39a66a6712baa3c1e35722d80 100644 (file)
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -179,7 +179,7 @@ int nbp_backup_change(struct net_bridge_port *p,
        ASSERT_RTNL();
 
        if (backup_dev) {
-               if (!br_port_exists(backup_dev))
+               if (!netif_is_bridge_port(backup_dev))
                        return -ENOENT;
 
                backup_p = br_port_get_rtnl(backup_dev);

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index b257342c08602044383b32ed49cea79aef7c80c5..f5343dfac2826ea39d8172d4d8459c438b71044b 100644 (file)
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -2189,7 +2189,7 @@ int br_multicast_list_adjacent(struct net_device *dev,
        int count = 0;
 
        rcu_read_lock();
-       if (!br_ip_list || !br_port_exists(dev))
+       if (!br_ip_list || !netif_is_bridge_port(dev))
                goto unlock;
 
        port = br_port_get_rcu(dev);
@@ -2236,7 +2236,7 @@ bool br_multicast_has_querier_anywhere(struct net_device *dev, int proto)
        bool ret = false;
 
        rcu_read_lock();
-       if (!br_port_exists(dev))
+       if (!netif_is_bridge_port(dev))
                goto unlock;
 
        port = br_port_get_rcu(dev);
@@ -2272,7 +2272,7 @@ bool br_multicast_has_querier_adjacent(struct net_device *dev, int proto)
        bool ret = false;
 
        rcu_read_lock();
-       if (!br_port_exists(dev))
+       if (!netif_is_bridge_port(dev))
                goto unlock;
 
        port = br_port_get_rcu(dev);

diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 9c07591b0232e6bbdecf7efece7c9143842671b1..4f9f59eba8b4552c63460be52c81ce3376221782 100644 (file)
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -102,7 +102,7 @@ static size_t br_get_link_af_size_filtered(const struct net_device *dev,
        size_t vinfo_sz = 0;
 
        rcu_read_lock();
-       if (br_port_exists(dev)) {
+       if (netif_is_bridge_port(dev)) {
                p = br_port_get_rcu(dev);
                vg = nbp_vlan_group_rcu(p);
        } else if (dev->priv_flags & IFF_EBRIDGE) {

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 00deef7fc1f303656b8f7c7ce7b094ba6194944a..7946aa3b6e099d529773023d119646e1b66c097a 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -288,8 +288,6 @@ struct net_bridge_port {
 #define br_auto_port(p) ((p)->flags & BR_AUTO_MASK)
 #define br_promisc_port(p) ((p)->flags & BR_PROMISC)
 
-#define br_port_exists(dev) (dev->priv_flags & IFF_BRIDGE_PORT)
-
 static inline struct net_bridge_port *br_port_get_rcu(const struct net_device *dev)
 {
        return rcu_dereference(dev->rx_handler_data);
@@ -297,13 +295,13 @@ static inline struct net_bridge_port *br_port_get_rcu(const struct net_device *d
 
 static inline struct net_bridge_port *br_port_get_rtnl(const struct net_device *dev)
 {
-       return br_port_exists(dev) ?
+       return netif_is_bridge_port(dev) ?
                rtnl_dereference(dev->rx_handler_data) : NULL;
 }
 
 static inline struct net_bridge_port *br_port_get_rtnl_rcu(const struct net_device *dev)
 {
-       return br_port_exists(dev) ?
+       return netif_is_bridge_port(dev) ?
                rcu_dereference_rtnl(dev->rx_handler_data) : NULL;
 }