aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
authorOlaf Rempel <razzor@kopf-tisch.de>2005-11-23 22:04:08 -0500
committerDavid S. Miller <davem@davemloft.net>2005-11-23 22:04:08 -0500
commit133747e8d1e912863edfb3869e36b97b9939d4fc (patch)
tree9ae6c1b39bd3dc08a1a8b4b96ba28be0ed553609 /net/bridge
parentde919820cf7fe6674cdf47f8f47d2af284e4309f (diff)
[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>
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/br_if.c1
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)
366 366
367 spin_lock_bh(&br->lock); 367 spin_lock_bh(&br->lock);
368 br_stp_recalculate_bridge_id(br); 368 br_stp_recalculate_bridge_id(br);
369 br_features_recompute(br);
369 if ((br->dev->flags & IFF_UP) 370 if ((br->dev->flags & IFF_UP)
370 && (dev->flags & IFF_UP) && netif_carrier_ok(dev)) 371 && (dev->flags & IFF_UP) && netif_carrier_ok(dev))
371 br_stp_enable_port(p); 372 br_stp_enable_port(p);