diff options
| author | Jeff Garzik | 2005-11-29 09:50:33 +0100 |
|---|---|---|
| committer | Jeff Garzik | 2005-11-29 09:50:33 +0100 |
| commit | 2226340eb8df9c42f9fca74582d08d5117fc0cec (patch) | |
| tree | c98370844715194600b79f886dbc391633f3e470 /net/bridge/br_if.c | |
| parent | [bonding] Remove superfluous changelog. (diff) | |
| parent | Linux v2.6.15-rc3 (diff) | |
| download | kernel-qcow2-linux-2226340eb8df9c42f9fca74582d08d5117fc0cec.tar.gz kernel-qcow2-linux-2226340eb8df9c42f9fca74582d08d5117fc0cec.tar.xz kernel-qcow2-linux-2226340eb8df9c42f9fca74582d08d5117fc0cec.zip | |
Merge branch 'master'
Diffstat (limited to 'net/bridge/br_if.c')
| -rw-r--r-- | net/bridge/br_if.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index defcf6a8607c..975abe254b7a 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -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); |