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: Kyungrok Chung <acadx0@gmail.com>
Reviewed-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c
index a3b6658ed789919444a8ad341387ee06bdb5101c..433901dcf0c37cd033a1e0b4154342c93dd52347 100644 (file)
--- a/net/batman-adv/multicast.c
+++ b/net/batman-adv/multicast.c
@@ -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();

diff --git a/net/bridge/br.c b/net/bridge/br.c
index d3a32c6813e028276ea478fea147729a0da09f20..1fac72cc617ff7e1851b715860a95e9a1247b9b1 100644 (file)
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -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);

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 46812b659710a09d1cbcc672a7868f6366209082..a6a68e18c70abf1af59bd6b11687f0c7f64c0225 100644 (file)
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -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 {

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 4a02f8bb278a123714d93f7a1d7d3eb3fb310d01..c11bba3e7ec098307b9316e1957438a5555f789b 100644 (file)
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -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;
        }

diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c
index 49c268871fc11b6d3b08798561c6e0a56b722d32..db4ab2c2ce18b02b0ac29a8b86b09e85e1a6f969 100644 (file)
--- a/net/bridge/br_ioctl.c
+++ b/net/bridge/br_ioctl.c
@@ -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();

diff --git a/net/bridge/br_mdb.c b/net/bridge/br_mdb.c
index 0281453f776637cbbe0a3c71058a0a907d9ed5ef..61ccf46fcc2118fbbe3d8ddede387c4762c7cf05 100644 (file)
--- a/net/bridge/br_mdb.c
+++ b/net/bridge/br_mdb.c
@@ -422,7 +422,7 @@ static int br_mdb_dump(struct sk_buff *skb, struct netlink_callback *cb)
        cb->seq = net->dev_base_seq;
 
        for_each_netdev_rcu(net, dev) {
-               if (dev->priv_flags & IFF_EBRIDGE) {
+               if (netif_is_bridge_master(dev)) {
                        struct net_bridge *br = netdev_priv(dev);
                        struct br_port_msg *bpm;
 
@@ -1016,7 +1016,7 @@ static int br_mdb_parse(struct sk_buff *skb, struct nlmsghdr *nlh,
                return -ENODEV;
        }
 
-       if (!(dev->priv_flags & IFF_EBRIDGE)) {
+       if (!netif_is_bridge_master(dev)) {
                NL_SET_ERR_MSG_MOD(extack, "Device is not a bridge");
                return -EOPNOTSUPP;
        }

diff --git a/net/bridge/br_netfilter_hooks.c b/net/bridge/br_netfilter_hooks.c
index 8edfb98ae1d583665f5396b5110a3875e0518561..b5af68c105a83aec9243e5595738a036712af9ed 100644 (file)
--- a/net/bridge/br_netfilter_hooks.c
+++ b/net/bridge/br_netfilter_hooks.c
@@ -968,7 +968,7 @@ static int brnf_device_event(struct notifier_block *unused, unsigned long event,
        struct net *net;
        int ret;
 
-       if (event != NETDEV_REGISTER || !(dev->priv_flags & IFF_EBRIDGE))
+       if (event != NETDEV_REGISTER || !netif_is_bridge_master(dev))
                return NOTIFY_DONE;
 
        ASSERT_RTNL();

diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 5c6c4305ed235891b2ed5c5a17eb8382f2aec1a0..0c8b5f1a15bc0ba772f3f2a6b1f7e975a33cd42a 100644 (file)
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -106,7 +106,7 @@ static size_t br_get_link_af_size_filtered(const struct net_device *dev,
                p = br_port_get_check_rcu(dev);
                if (p)
                        vg = nbp_vlan_group_rcu(p);
-       } else if (dev->priv_flags & IFF_EBRIDGE) {
+       } else if (netif_is_bridge_master(dev)) {
                br = netdev_priv(dev);
                vg = br_vlan_group_rcu(br);
        }
@@ -1050,7 +1050,7 @@ int br_dellink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags)
 
        p = br_port_get_rtnl(dev);
        /* We want to accept dev as bridge itself as well */
-       if (!p && !(dev->priv_flags & IFF_EBRIDGE))
+       if (!p && !netif_is_bridge_master(dev))
                return -EINVAL;
 
        err = br_afspec(br, p, afspec, RTM_DELLINK, &changed, NULL);

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 2dc1b209ba9152acf6bac424c702646eaa2cdc5f..564d24c451af7c58e9fab5c3a1178f1026bf86bc 100644 (file)
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -4384,7 +4384,7 @@ static int rtnl_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb)
                                        continue;
 
                                if (br_dev != netdev_master_upper_dev_get(dev) &&
-                                   !(dev->priv_flags & IFF_EBRIDGE))
+                                   !netif_is_bridge_master(dev))
                                        continue;
                                cops = ops;
                        }