UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: bridge: convert group_addr_set option to a bit 

Convert group_addr_set internal bridge opt to a bit.

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Reviewed-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nikolay Aleksandrov 2018-09-26 17:01:02 +03:00 committed by David S. Miller
parent 8df3510f28
commit be3664a038
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/bridge/br_netlink.c
View File

@ -1139,7 +1139,7 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[],
spin_lock_bh(&br->lock); spin_lock_bh(&br->lock);
memcpy(br->group_addr, new_addr, sizeof(br->group_addr)); memcpy(br->group_addr, new_addr, sizeof(br->group_addr));
spin_unlock_bh(&br->lock); spin_unlock_bh(&br->lock);
br->group_addr_set = true; br_opt_toggle(br, BROPT_GROUP_ADDR_SET, true);
br_recalculate_fwd_mask(br); br_recalculate_fwd_mask(br);
} }

2
net/bridge/br_private.h
View File

@ -312,6 +312,7 @@ enum net_bridge_opts {
BROPT_NF_CALL_IPTABLES, BROPT_NF_CALL_IPTABLES,
BROPT_NF_CALL_IP6TABLES, BROPT_NF_CALL_IP6TABLES,
BROPT_NF_CALL_ARPTABLES, BROPT_NF_CALL_ARPTABLES,
BROPT_GROUP_ADDR_SET,
}; };
struct net_bridge { struct net_bridge {
@ -355,7 +356,6 @@ struct net_bridge {
unsigned long bridge_ageing_time; unsigned long bridge_ageing_time;
u8 group_addr[ETH_ALEN]; u8 group_addr[ETH_ALEN];
bool group_addr_set;
enum { enum {
BR_NO_STP, /* no spanning tree */ BR_NO_STP, /* no spanning tree */

2
net/bridge/br_sysfs_br.c
View File

@ -303,7 +303,7 @@ static ssize_t group_addr_store(struct device *d,
ether_addr_copy(br->group_addr, new_addr); ether_addr_copy(br->group_addr, new_addr);
spin_unlock_bh(&br->lock); spin_unlock_bh(&br->lock);
br->group_addr_set = true; br_opt_toggle(br, BROPT_GROUP_ADDR_SET, true);
br_recalculate_fwd_mask(br); br_recalculate_fwd_mask(br);
netdev_state_change(br->dev); netdev_state_change(br->dev);

2
net/bridge/br_vlan.c
View File

@ -695,7 +695,7 @@ struct net_bridge_vlan *br_vlan_find(struct net_bridge_vlan_group *vg, u16 vid)
/* Must be protected by RTNL. */ /* Must be protected by RTNL. */
static void recalculate_group_addr(struct net_bridge *br) static void recalculate_group_addr(struct net_bridge *br)
{ {
if (br->group_addr_set) if (br_opt_get(br, BROPT_GROUP_ADDR_SET))
return; return;
spin_lock_bh(&br->lock); spin_lock_bh(&br->lock);