From 5bb6e3ef36060e63b9d1e333d926a8d203811639 Mon Sep 17 00:00:00 2001
From: Olaf Rempel <razzor@kopf-tisch.de>
Date: Wed, 23 Nov 2005 19:04:08 -0800
Subject: [PATCH] --- yaml --- r: 14655 b: refs/heads/master c:
 133747e8d1e912863edfb3869e36b97b9939d4fc h: refs/heads/master i:   14653:
 e1ef829a29e7195641fa223ac061ba06a32706f7   14651:
 3e944169ae42b4756f1abc82de7f5aeb7f04c0a4   14647:
 feb7d2ee7c062a64361c2d0b225820f82be3f93d   14639:
 8b84283fef7478a4206b736b90b9cd68db6c41b6   14623:
 80d473d5f8360ee52090ca441374d91b55877317   14591:
 0d7116b479580e66df5e93bc3e91e19311f8819f v: v3

---
 [refs]                   | 2 +-
 trunk/net/bridge/br_if.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 51810161a0fa..946f73958ac6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de919820cf7fe6674cdf47f8f47d2af284e4309f
+refs/heads/master: 133747e8d1e912863edfb3869e36b97b9939d4fc
diff --git a/trunk/net/bridge/br_if.c b/trunk/net/bridge/br_if.c
index defcf6a8607c..975abe254b7a 100644
--- a/trunk/net/bridge/br_if.c
+++ b/trunk/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);