Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 14655
b: refs/heads/master
c: 133747e
h: refs/heads/master
i:
  14653: e1ef829
  14651: 3e94416
  14647: feb7d2e
  14639: 8b84283
  14623: 80d473d
  14591: 0d7116b
v: v3
  • Loading branch information
Olaf Rempel authored and David S. Miller committed Nov 24, 2005
1 parent 7cde5d5 commit 5bb6e3e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: de919820cf7fe6674cdf47f8f47d2af284e4309f
refs/heads/master: 133747e8d1e912863edfb3869e36b97b9939d4fc
1 change: 1 addition & 0 deletions trunk/net/bridge/br_if.c
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)

spin_lock_bh(&br->lock);
br_stp_recalculate_bridge_id(br);
br_features_recompute(br);
if ((br->dev->flags & IFF_UP)
&& (dev->flags & IFF_UP) && netif_carrier_ok(dev))
br_stp_enable_port(p);
Expand Down

0 comments on commit 5bb6e3e

Please sign in to comment.