bridge: make user modified path cost sticky
Subsystems (3)
PATCH 1/1 bridge: make user modified path cost sticky
Keep a STP port path cost value if it was set by a user. Don't replace it with the link-speed based path cost whenever the link goes down and comes back up.
Reported-by Roopa Prabhu <[email protected]>
Signed-off-by Stephen Hemminger <[email protected]>
--- net/bridge/br_if.c | 3 ++- net/bridge/br_private.h | 1 + net/bridge/br_stp_if.c | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)
net/bridge/br_private.h +1 -0
@@ -156,6 +156,7 @@ struct net_bridge_port#define BR_BPDU_GUARD 0x00000002#define BR_ROOT_BLOCK 0x00000004#define BR_MULTICAST_FAST_LEAVE 0x00000008 +#define BR_ADMIN_COST 0x00000010#ifdef CONFIG_BRIDGE_IGMP_SNOOPING u32 multicast_startup_queries_sent;
net/bridge/br_stp_if.c +1 -0
@@ -288,6 +288,7 @@ int br_stp_set_path_cost(struct net_brid path_cost > BR_MAX_PATH_COST)return -ERANGE ; + p->flags |=BR_ADMIN_COST ; p->path_cost = path_cost;br_configuration_update (p->br);br_port_state_selection (p->br);
net/bridge/br_if.c +2 -1
@@ -67,7 +67,8 @@ void br_port_carrier_check(struct net_brstruct net_device *dev = p->dev;struct net_bridge *br = p->br; -if (netif_running (dev) &&netif_oper_up (dev)) +if (!(p->flags &BR_ADMIN_COST ) && +netif_running (dev) &&netif_oper_up (dev)) p->path_cost =port_cost (dev);if (!netif_running (br->dev))
From: Stephen Hemminger <[email protected]>
Date: Sat, 13 Apr 2013 17:06:07 -0700
Quoted 6 lines
Keep a STP port path cost value if it was set by a user. Don't replace it with the link-speed based path cost whenever the link goes down and comes back up.
Reported-by Roopa Prabhu <[email protected]>Signed-off-by Stephen Hemminger <[email protected]>
Applied, thanks.