From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nikolay Aleksandrov Subject: [PATCH net-next 8/9] net: bridge: convert mtu_set_by_user to a bit Date: Wed, 26 Sep 2018 15:18:01 +0300 Message-ID: <20180926121802.27851-9-nikolay@cumulusnetworks.com> References: <20180926121802.27851-1-nikolay@cumulusnetworks.com> Cc: roopa@cumulusnetworks.com, davem@davemloft.net, stephen@networkplumber.org, bridge@lists.linux-foundation.org, Nikolay Aleksandrov To: netdev@vger.kernel.org Return-path: Received: from mail-wr1-f65.google.com ([209.85.221.65]:46222 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727479AbeIZSbh (ORCPT ); Wed, 26 Sep 2018 14:31:37 -0400 Received: by mail-wr1-f65.google.com with SMTP id z3-v6so14953686wrr.13 for ; Wed, 26 Sep 2018 05:18:53 -0700 (PDT) In-Reply-To: <20180926121802.27851-1-nikolay@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org List-ID: Convert the last remaining bool option to a bit thus reducing the overall net_bridge size further by 8 bytes. Signed-off-by: Nikolay Aleksandrov --- net/bridge/br_device.c | 2 +- net/bridge/br_if.c | 4 ++-- net/bridge/br_private.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index a0afdca73d8f..e053a4e43758 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -228,7 +228,7 @@ static int br_change_mtu(struct net_device *dev, int new_mtu) dev->mtu = new_mtu; /* this flag will be cleared if the MTU was automatically adjusted */ - br->mtu_set_by_user = true; + br_opt_toggle(br, BROPT_MTU_SET_BY_USER, true); #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) /* remember the MTU in the rtable for PMTU */ dst_metric_set(&br->fake_rtable.dst, RTAX_MTU, new_mtu); diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 3bb66508f07d..9b46d2dc4c22 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -508,14 +508,14 @@ void br_mtu_auto_adjust(struct net_bridge *br) ASSERT_RTNL(); /* if the bridge MTU was manually configured don't mess with it */ - if (br->mtu_set_by_user) + if (br_opt_get(br, BROPT_MTU_SET_BY_USER)) return; /* change to the minimum MTU and clear the flag which was set by * the bridge ndo_change_mtu callback */ dev_set_mtu(br->dev, br_mtu_min(br)); - br->mtu_set_by_user = false; + br_opt_toggle(br, BROPT_MTU_SET_BY_USER, false); } static void br_set_gso_limits(struct net_bridge *br) diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 6bdcc701bc71..92d08f8c7dd4 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -319,6 +319,7 @@ enum net_bridge_opts { BROPT_MULTICAST_STATS_ENABLED, BROPT_HAS_IPV6_ADDR, BROPT_NEIGH_SUPPRESS_ENABLED, + BROPT_MTU_SET_BY_USER, }; struct net_bridge { @@ -415,7 +416,6 @@ struct net_bridge { #ifdef CONFIG_NET_SWITCHDEV int offload_fwd_mark; #endif - bool mtu_set_by_user; struct hlist_head fdb_list; }; -- 2.11.0