From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nikolay Aleksandrov Subject: [PATCH net-next v2 4/9] net: bridge: convert group_addr_set option to a bit Date: Wed, 26 Sep 2018 17:01:02 +0300 Message-ID: <20180926140107.10218-5-nikolay@cumulusnetworks.com> References: <20180926140107.10218-1-nikolay@cumulusnetworks.com> Cc: roopa@cumulusnetworks.com, davem@davemloft.net, stephen@networkplumber.org, bridge@lists.linux-foundation.org, idosch@idosch.org, Nikolay Aleksandrov To: netdev@vger.kernel.org Return-path: Received: from mail-wm1-f68.google.com ([209.85.128.68]:53230 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727344AbeIZUOb (ORCPT ); Wed, 26 Sep 2018 16:14:31 -0400 Received: by mail-wm1-f68.google.com with SMTP id l7-v6so2421175wme.2 for ; Wed, 26 Sep 2018 07:01:24 -0700 (PDT) In-Reply-To: <20180926140107.10218-1-nikolay@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org List-ID: Convert group_addr_set internal bridge opt to a bit. Signed-off-by: Nikolay Aleksandrov Reviewed-by: Stephen Hemminger --- net/bridge/br_netlink.c | 2 +- net/bridge/br_private.h | 2 +- net/bridge/br_sysfs_br.c | 2 +- net/bridge/br_vlan.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index 521893df0c2a..b00ccf35c35d 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -1139,7 +1139,7 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[], spin_lock_bh(&br->lock); memcpy(br->group_addr, new_addr, sizeof(br->group_addr)); spin_unlock_bh(&br->lock); - br->group_addr_set = true; + br_opt_toggle(br, BROPT_GROUP_ADDR_SET, true); br_recalculate_fwd_mask(br); } diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index d8eadab09d7d..dda117ce386e 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -312,6 +312,7 @@ enum net_bridge_opts { BROPT_NF_CALL_IPTABLES, BROPT_NF_CALL_IP6TABLES, BROPT_NF_CALL_ARPTABLES, + BROPT_GROUP_ADDR_SET, }; struct net_bridge { @@ -355,7 +356,6 @@ struct net_bridge { unsigned long bridge_ageing_time; u8 group_addr[ETH_ALEN]; - bool group_addr_set; enum { BR_NO_STP, /* no spanning tree */ diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c index 0f8545c94948..4c2d56354d89 100644 --- a/net/bridge/br_sysfs_br.c +++ b/net/bridge/br_sysfs_br.c @@ -303,7 +303,7 @@ static ssize_t group_addr_store(struct device *d, ether_addr_copy(br->group_addr, new_addr); spin_unlock_bh(&br->lock); - br->group_addr_set = true; + br_opt_toggle(br, BROPT_GROUP_ADDR_SET, true); br_recalculate_fwd_mask(br); netdev_state_change(br->dev); diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c index 61d698bfe2b7..5942e03dd845 100644 --- a/net/bridge/br_vlan.c +++ b/net/bridge/br_vlan.c @@ -695,7 +695,7 @@ struct net_bridge_vlan *br_vlan_find(struct net_bridge_vlan_group *vg, u16 vid) /* Must be protected by RTNL. */ static void recalculate_group_addr(struct net_bridge *br) { - if (br->group_addr_set) + if (br_opt_get(br, BROPT_GROUP_ADDR_SET)) return; spin_lock_bh(&br->lock); -- 2.11.0