From: Olaf Rempel <razzor@kopf-tisch.de>
Date: Thu, 24 Nov 2005 08:00:03 +0000 (-0800)
Subject: [PATCH] BRIDGE: recompute features when adding a new device
X-Git-Tag: v2.6.14.4~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51adb32b28e76270e850235a9f61c8379376be51;p=thirdparty%2Fkernel%2Fstable.git

[PATCH] BRIDGE: recompute features when adding a new device

[BRIDGE]: recompute features when adding a new device

We must recompute bridge features everytime the list of underlying
devices changes, or we might end up with features that are not supported
by all devices (eg. NETIF_F_TSO)
This patch adds the missing recompute when adding a device to the bridge.

Signed-off-by: Olaf Rempel <razzor@kopf-tisch.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index defcf6a8607c3..975abe254b7a9 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);