lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bridge: add notification over netlink when STP changes state

Browse Source 
When STP changes state of interface need to send a new link
message to reflect that change.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
stephen hemminger
2011-07-22 07:47:09 +00:00
committed by David S. Miller
parent 56139fc5bd
commit 4ecb961c8b
4 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/bridge/br_netlink.c
View File

@@ -188,6 +188,8 @@ static int br_rtm_setlink(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
p->state = new_state; p->state = new_state;
br_log_state(p); br_log_state(p);
br_ifinfo_notify(RTM_NEWLINK, p);
return 0; return 0;
} }

4
net/bridge/br_stp.c
View File

@@ -363,6 +363,8 @@ static void br_make_blocking(struct net_bridge_port *p)
p->state = BR_STATE_BLOCKING; p->state = BR_STATE_BLOCKING;
br_log_state(p); br_log_state(p);
br_ifinfo_notify(RTM_NEWLINK, p);
del_timer(&p->forward_delay_timer); del_timer(&p->forward_delay_timer);
} }
} }
@@ -386,8 +388,8 @@ static void br_make_forwarding(struct net_bridge_port *p)
p->state = BR_STATE_LEARNING; p->state = BR_STATE_LEARNING;
br_multicast_enable_port(p); br_multicast_enable_port(p);
br_log_state(p); br_log_state(p);
br_ifinfo_notify(RTM_NEWLINK, p);
if (br->forward_delay != 0) if (br->forward_delay != 0)
mod_timer(&p->forward_delay_timer, jiffies + br->forward_delay); mod_timer(&p->forward_delay_timer, jiffies + br->forward_delay);

3
net/bridge/br_stp_if.c
View File

@@ -88,6 +88,7 @@ void br_stp_enable_port(struct net_bridge_port *p)
br_init_port(p); br_init_port(p);
br_port_state_selection(p->br); br_port_state_selection(p->br);
br_log_state(p); br_log_state(p);
br_ifinfo_notify(RTM_NEWLINK, p);
} }
/* called under bridge lock */ /* called under bridge lock */
@@ -104,6 +105,8 @@ void br_stp_disable_port(struct net_bridge_port *p)
p->topology_change_ack = 0; p->topology_change_ack = 0;
p->config_pending = 0; p->config_pending = 0;
br_ifinfo_notify(RTM_NEWLINK, p);
del_timer(&p->message_age_timer); del_timer(&p->message_age_timer);
del_timer(&p->forward_delay_timer); del_timer(&p->forward_delay_timer);
del_timer(&p->hold_timer); del_timer(&p->hold_timer);

1
net/bridge/br_stp_timer.c
View File

@@ -97,6 +97,7 @@ static void br_forward_delay_timer_expired(unsigned long arg)
netif_carrier_on(br->dev); netif_carrier_on(br->dev);
} }
br_log_state(p); br_log_state(p);
br_ifinfo_notify(RTM_NEWLINK, p);
spin_unlock(&br->lock); spin_unlock(&br->lock);
} }