Commit 254ec036 authored by Kyungrok Chung's avatar Kyungrok Chung Committed by David S. Miller
Browse files

net: make use of helper netif_is_bridge_master() 



Make use of netdev helper functions to improve code readability.
Replace 'dev->priv_flags & IFF_EBRIDGE' with netif_is_bridge_master(dev).

Signed-off-by: default avatarKyungrok Chung <acadx0@gmail.com>
Reviewed-by: default avatarNikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4e6e167b

net/batman-adv/multicast.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static struct net_device *batadv_mcast_get_bridge(struct net_device *soft_iface) 
	rcu_read_lock();

	do {

		upper = netdev_master_upper_dev_get_rcu(upper);

	} while (upper && !(upper->priv_flags & IFF_EBRIDGE));

	} while (upper && !netif_is_bridge_master(upper));



	dev_hold(upper);

	rcu_read_unlock();

net/bridge/br.c

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v 
	bool changed_addr;

	int err;



	if (dev->priv_flags & IFF_EBRIDGE) {

	if (netif_is_bridge_master(dev)) {

		err = br_vlan_bridge_event(dev, event, ptr);

		if (err)

			return notifier_from_errno(err);
@@ -349,7 +349,7 @@ static void __net_exit br_net_exit(struct net *net) 


	rtnl_lock();

	for_each_netdev(net, dev)

		if (dev->priv_flags & IFF_EBRIDGE)

		if (netif_is_bridge_master(dev))

			br_dev_delete(dev, &list);



	unregister_netdevice_many(&list);

net/bridge/br_fdb.c

+3 −3
Original line number Diff line number Diff line
@@ -825,7 +825,7 @@ int br_fdb_dump(struct sk_buff *skb, 
	struct net_bridge_fdb_entry *f;

	int err = 0;



	if (!(dev->priv_flags & IFF_EBRIDGE))

	if (!netif_is_bridge_master(dev))

		return err;



	if (!filter_dev) {
@@ -1076,7 +1076,7 @@ int br_fdb_add(struct ndmsg *ndm, struct nlattr *tb[], 
		return -EINVAL;

	}



	if (dev->priv_flags & IFF_EBRIDGE) {

	if (netif_is_bridge_master(dev)) {

		br = netdev_priv(dev);

		vg = br_vlan_group(br);

	} else {
@@ -1173,7 +1173,7 @@ int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[], 
	struct net_bridge *br;

	int err;



	if (dev->priv_flags & IFF_EBRIDGE) {

	if (netif_is_bridge_master(dev)) {

		br = netdev_priv(dev);

		vg = br_vlan_group(br);

	} else {

net/bridge/br_if.c

+1 −1
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ int br_del_bridge(struct net *net, const char *name) 
	if (dev == NULL)

		ret =  -ENXIO; 	/* Could not find device */



	else if (!(dev->priv_flags & IFF_EBRIDGE)) {

	else if (!netif_is_bridge_master(dev)) {

		/* Attempt to delete non bridge device! */

		ret = -EPERM;

	}

net/bridge/br_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static int get_bridge_ifindices(struct net *net, int *indices, int num) 
	for_each_netdev_rcu(net, dev) {

		if (i >= num)

			break;

		if (dev->priv_flags & IFF_EBRIDGE)

		if (netif_is_bridge_master(dev))

			indices[i++] = dev->ifindex;

	}

	rcu_read_unlock();