leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: make use of helper netif_is_bridge_master()

Browse Source 
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>
This commit is contained in:
Kyungrok Chung 2021-10-16 20:21:36 +09:00 committed by David S. Miller
parent 4e6e167bc0
commit 254ec036db
9 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/batman-adv/multicast.c
View File

@ -89,7 +89,7 @@ static struct net_device *batadv_mcast_get_bridge(struct net_device *soft_iface)
rcu_read_lock(); rcu_read_lock();
do { do {
upper = netdev_master_upper_dev_get_rcu(upper); 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); dev_hold(upper);
rcu_read_unlock(); rcu_read_unlock();

4
net/bridge/br.c
View File

@ -36,7 +36,7 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v
bool changed_addr; bool changed_addr;
int err; int err;
if (dev->priv_flags & IFF_EBRIDGE) { if (netif_is_bridge_master(dev)) {
err = br_vlan_bridge_event(dev, event, ptr); err = br_vlan_bridge_event(dev, event, ptr);
if (err) if (err)
return notifier_from_errno(err); return notifier_from_errno(err);
@ -349,7 +349,7 @@ static void __net_exit br_net_exit(struct net *net)
rtnl_lock(); rtnl_lock();
for_each_netdev(net, dev) for_each_netdev(net, dev)
if (dev->priv_flags & IFF_EBRIDGE) if (netif_is_bridge_master(dev))
br_dev_delete(dev, &list); br_dev_delete(dev, &list);
unregister_netdevice_many(&list); unregister_netdevice_many(&list);

6
net/bridge/br_fdb.c
View File

@ -825,7 +825,7 @@ int br_fdb_dump(struct sk_buff *skb,
struct net_bridge_fdb_entry *f; struct net_bridge_fdb_entry *f;
int err = 0; int err = 0;
if (!(dev->priv_flags & IFF_EBRIDGE)) if (!netif_is_bridge_master(dev))
return err; return err;
if (!filter_dev) { if (!filter_dev) {
@ -1076,7 +1076,7 @@ int br_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
return -EINVAL; return -EINVAL;
} }
if (dev->priv_flags & IFF_EBRIDGE) { if (netif_is_bridge_master(dev)) {
br = netdev_priv(dev); br = netdev_priv(dev);
vg = br_vlan_group(br); vg = br_vlan_group(br);
} else { } else {
@ -1173,7 +1173,7 @@ int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
struct net_bridge *br; struct net_bridge *br;
int err; int err;
if (dev->priv_flags & IFF_EBRIDGE) { if (netif_is_bridge_master(dev)) {
br = netdev_priv(dev); br = netdev_priv(dev);
vg = br_vlan_group(br); vg = br_vlan_group(br);
} else { } else {

2
net/bridge/br_if.c
View File

@ -471,7 +471,7 @@ int br_del_bridge(struct net *net, const char *name)
if (dev == NULL) if (dev == NULL)
ret = -ENXIO; /* Could not find device */ 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! */ /* Attempt to delete non bridge device! */
ret = -EPERM; ret = -EPERM;
} }

2
net/bridge/br_ioctl.c
View File

@ -26,7 +26,7 @@ static int get_bridge_ifindices(struct net *net, int *indices, int num)
for_each_netdev_rcu(net, dev) { for_each_netdev_rcu(net, dev) {
if (i >= num) if (i >= num)
break; break;
if (dev->priv_flags & IFF_EBRIDGE) if (netif_is_bridge_master(dev))
indices[i++] = dev->ifindex; indices[i++] = dev->ifindex;
} }
rcu_read_unlock(); rcu_read_unlock();

4
net/bridge/br_mdb.c
View File

@ -422,7 +422,7 @@ static int br_mdb_dump(struct sk_buff *skb, struct netlink_callback *cb)
cb->seq = net->dev_base_seq; cb->seq = net->dev_base_seq;
for_each_netdev_rcu(net, dev) { 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 net_bridge *br = netdev_priv(dev);
struct br_port_msg *bpm; struct br_port_msg *bpm;
@ -1016,7 +1016,7 @@ static int br_mdb_parse(struct sk_buff *skb, struct nlmsghdr *nlh,
return -ENODEV; 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"); NL_SET_ERR_MSG_MOD(extack, "Device is not a bridge");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }

2
net/bridge/br_netfilter_hooks.c
View File

@ -968,7 +968,7 @@ static int brnf_device_event(struct notifier_block *unused, unsigned long event,
struct net *net; struct net *net;
int ret; int ret;
if (event != NETDEV_REGISTER || !(dev->priv_flags & IFF_EBRIDGE)) if (event != NETDEV_REGISTER || !netif_is_bridge_master(dev))
return NOTIFY_DONE; return NOTIFY_DONE;
ASSERT_RTNL(); ASSERT_RTNL();

4
net/bridge/br_netlink.c
View File

@ -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); p = br_port_get_check_rcu(dev);
if (p) if (p)
vg = nbp_vlan_group_rcu(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); br = netdev_priv(dev);
vg = br_vlan_group_rcu(br); 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); p = br_port_get_rtnl(dev);
/* We want to accept dev as bridge itself as well */ /* 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; return -EINVAL;
err = br_afspec(br, p, afspec, RTM_DELLINK, &changed, NULL); err = br_afspec(br, p, afspec, RTM_DELLINK, &changed, NULL);

2
net/core/rtnetlink.c
View File

@ -4384,7 +4384,7 @@ static int rtnl_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb)
continue; continue;
if (br_dev != netdev_master_upper_dev_get(dev) && if (br_dev != netdev_master_upper_dev_get(dev) &&
!(dev->priv_flags & IFF_EBRIDGE)) !netif_is_bridge_master(dev))
continue; continue;
cops = ops; cops = ops;
} }