Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 258431
b: refs/heads/master
c: 4ecb961
h: refs/heads/master
i:
  258429: 652cb89
  258427: f666987
  258423: 976c394
  258415: 25e601a
  258399: 6370d93
  258367: cf0a58d
  258303: 1cd06c0
v: v3
  • Loading branch information
stephen hemminger authored and David S. Miller committed Jul 23, 2011
1 parent 2821b7e commit 8b804a1
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 56139fc5bd6e740706993ab3ad0d0aeff69a8479
refs/heads/master: 4ecb961c8b474ebef5aff55f715c7875e69dd57b
2 changes: 2 additions & 0 deletions trunk/net/bridge/br_netlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@ static int br_rtm_setlink(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)

p->state = new_state;
br_log_state(p);
br_ifinfo_notify(RTM_NEWLINK, p);

return 0;
}

Expand Down
4 changes: 3 additions & 1 deletion trunk/net/bridge/br_stp.c
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,8 @@ static void br_make_blocking(struct net_bridge_port *p)

p->state = BR_STATE_BLOCKING;
br_log_state(p);
br_ifinfo_notify(RTM_NEWLINK, p);

del_timer(&p->forward_delay_timer);
}
}
Expand All @@ -386,8 +388,8 @@ static void br_make_forwarding(struct net_bridge_port *p)
p->state = BR_STATE_LEARNING;

br_multicast_enable_port(p);

br_log_state(p);
br_ifinfo_notify(RTM_NEWLINK, p);

if (br->forward_delay != 0)
mod_timer(&p->forward_delay_timer, jiffies + br->forward_delay);
Expand Down
3 changes: 3 additions & 0 deletions trunk/net/bridge/br_stp_if.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ void br_stp_enable_port(struct net_bridge_port *p)
br_init_port(p);
br_port_state_selection(p->br);
br_log_state(p);
br_ifinfo_notify(RTM_NEWLINK, p);
}

/* called under bridge lock */
Expand All @@ -104,6 +105,8 @@ void br_stp_disable_port(struct net_bridge_port *p)
p->topology_change_ack = 0;
p->config_pending = 0;

br_ifinfo_notify(RTM_NEWLINK, p);

del_timer(&p->message_age_timer);
del_timer(&p->forward_delay_timer);
del_timer(&p->hold_timer);
Expand Down
1 change: 1 addition & 0 deletions trunk/net/bridge/br_stp_timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ static void br_forward_delay_timer_expired(unsigned long arg)
netif_carrier_on(br->dev);
}
br_log_state(p);
br_ifinfo_notify(RTM_NEWLINK, p);
spin_unlock(&br->lock);
}

Expand Down

0 comments on commit 8b804a1

Please sign in to comment.