Commit 3341d917 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller

net: bridge: convert mtu_set_by_user to a bit

Convert the last remaining bool option to a bit thus reducing the overall
net_bridge size further by 8 bytes.
Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Reviewed-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c69c2cd4
...@@ -228,7 +228,7 @@ static int br_change_mtu(struct net_device *dev, int new_mtu) ...@@ -228,7 +228,7 @@ static int br_change_mtu(struct net_device *dev, int new_mtu)
dev->mtu = new_mtu; dev->mtu = new_mtu;
/* this flag will be cleared if the MTU was automatically adjusted */ /* 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) #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
/* remember the MTU in the rtable for PMTU */ /* remember the MTU in the rtable for PMTU */
dst_metric_set(&br->fake_rtable.dst, RTAX_MTU, new_mtu); dst_metric_set(&br->fake_rtable.dst, RTAX_MTU, new_mtu);
......
...@@ -508,14 +508,14 @@ void br_mtu_auto_adjust(struct net_bridge *br) ...@@ -508,14 +508,14 @@ void br_mtu_auto_adjust(struct net_bridge *br)
ASSERT_RTNL(); ASSERT_RTNL();
/* if the bridge MTU was manually configured don't mess with it */ /* 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; return;
/* change to the minimum MTU and clear the flag which was set by /* change to the minimum MTU and clear the flag which was set by
* the bridge ndo_change_mtu callback * the bridge ndo_change_mtu callback
*/ */
dev_set_mtu(br->dev, br_mtu_min(br)); 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) static void br_set_gso_limits(struct net_bridge *br)
......
...@@ -319,6 +319,7 @@ enum net_bridge_opts { ...@@ -319,6 +319,7 @@ enum net_bridge_opts {
BROPT_MULTICAST_STATS_ENABLED, BROPT_MULTICAST_STATS_ENABLED,
BROPT_HAS_IPV6_ADDR, BROPT_HAS_IPV6_ADDR,
BROPT_NEIGH_SUPPRESS_ENABLED, BROPT_NEIGH_SUPPRESS_ENABLED,
BROPT_MTU_SET_BY_USER,
}; };
struct net_bridge { struct net_bridge {
...@@ -415,7 +416,6 @@ struct net_bridge { ...@@ -415,7 +416,6 @@ struct net_bridge {
#ifdef CONFIG_NET_SWITCHDEV #ifdef CONFIG_NET_SWITCHDEV
int offload_fwd_mark; int offload_fwd_mark;
#endif #endif
bool mtu_set_by_user;
struct hlist_head fdb_list; struct hlist_head fdb_list;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment