summaryrefslogtreecommitdiffstats
path: root/net/bridge/br_multicast.c
diff options
context:
space:
mode:
authorJulian Wiedmann2019-03-29 14:38:19 +0100
committerDavid S. Miller2019-03-29 21:48:40 +0100
commit35f861e3c58e128f0ecb5669c43159285ea5254a (patch)
tree2fda4541bfa1905a3ecd340aebf042fe57c8a8fa /net/bridge/br_multicast.c
parentteam: use netif_is_team_port() (diff)
downloadkernel-qcow2-linux-35f861e3c58e128f0ecb5669c43159285ea5254a.tar.gz
kernel-qcow2-linux-35f861e3c58e128f0ecb5669c43159285ea5254a.tar.xz
kernel-qcow2-linux-35f861e3c58e128f0ecb5669c43159285ea5254a.zip
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>
Diffstat (limited to 'net/bridge/br_multicast.c')
-rw-r--r--net/bridge/br_multicast.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index b257342c0860..f5343dfac282 100644
--- 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);