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

net: bridge: use netif_is_bridge_port()

Browse Source 
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>
This commit is contained in:
Julian Wiedmann 2019-03-29 14:38:19 +01:00 committed by David S. Miller
parent acb10eac51
commit 35f861e3c5
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/bridge/br_if.c
View File

@ -179,7 +179,7 @@ int nbp_backup_change(struct net_bridge_port *p,
ASSERT_RTNL(); ASSERT_RTNL();
if (backup_dev) { if (backup_dev) {
if (!br_port_exists(backup_dev)) if (!netif_is_bridge_port(backup_dev))
return -ENOENT; return -ENOENT;
backup_p = br_port_get_rtnl(backup_dev); backup_p = br_port_get_rtnl(backup_dev);

6
net/bridge/br_multicast.c
View File

@ -2189,7 +2189,7 @@ int br_multicast_list_adjacent(struct net_device *dev,
int count = 0; int count = 0;
rcu_read_lock(); rcu_read_lock();
if (!br_ip_list || !br_port_exists(dev)) if (!br_ip_list || !netif_is_bridge_port(dev))
goto unlock; goto unlock;
port = br_port_get_rcu(dev); 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; bool ret = false;
rcu_read_lock(); rcu_read_lock();
if (!br_port_exists(dev)) if (!netif_is_bridge_port(dev))
goto unlock; goto unlock;
port = br_port_get_rcu(dev); 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; bool ret = false;
rcu_read_lock(); rcu_read_lock();
if (!br_port_exists(dev)) if (!netif_is_bridge_port(dev))
goto unlock; goto unlock;
port = br_port_get_rcu(dev); port = br_port_get_rcu(dev);

2
net/bridge/br_netlink.c
View File

@ -102,7 +102,7 @@ static size_t br_get_link_af_size_filtered(const struct net_device *dev,
size_t vinfo_sz = 0; size_t vinfo_sz = 0;
rcu_read_lock(); rcu_read_lock();
if (br_port_exists(dev)) { if (netif_is_bridge_port(dev)) {
p = br_port_get_rcu(dev); p = br_port_get_rcu(dev);
vg = nbp_vlan_group_rcu(p); vg = nbp_vlan_group_rcu(p);
} else if (dev->priv_flags & IFF_EBRIDGE) { } else if (dev->priv_flags & IFF_EBRIDGE) {

6
net/bridge/br_private.h
View File

@ -288,8 +288,6 @@ struct net_bridge_port {
#define br_auto_port(p) ((p)->flags & BR_AUTO_MASK) #define br_auto_port(p) ((p)->flags & BR_AUTO_MASK)
#define br_promisc_port(p) ((p)->flags & BR_PROMISC) #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) static inline struct net_bridge_port *br_port_get_rcu(const struct net_device *dev)
{ {
return rcu_dereference(dev->rx_handler_data); 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) 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; rtnl_dereference(dev->rx_handler_data) : NULL;
} }
static inline struct net_bridge_port *br_port_get_rtnl_rcu(const struct net_device *dev) 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; rcu_dereference_rtnl(dev->rx_handler_data) : NULL;
} }