Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35f861e3 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

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: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Acked-by: default avatarRoopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent acb10eac

net/bridge/br_if.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

net/bridge/br_multicast.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

net/bridge/br_netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

net/bridge/br_private.h

+2 −4
Original line number Diff line number Diff line
@@ -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;

}