---

yaml --- r: 264284 b: refs/heads/master c: b64b73d h: refs/heads/master v: v3
git-mirror · Oct 6, 2011 · 57cb27b · 57cb27b
1 parent 6645929
commit 57cb27b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3458e21c0d384ca04b27a2ea24d9314c1b57530f
+refs/heads/master: b64b73d7d0c480f75684519c6134e79d50c1b341
diff --git a/trunk/net/bridge/br_device.c b/trunk/net/bridge/br_device.c
@@ -91,7 +91,6 @@ static int br_dev_open(struct net_device *dev)
 {
 	struct net_bridge *br = netdev_priv(dev);
 
-	netif_carrier_off(dev);
 	netdev_update_features(dev);
 	netif_start_queue(dev);
 	br_stp_enable_bridge(br);
@@ -108,8 +107,6 @@ static int br_dev_stop(struct net_device *dev)
 {
 	struct net_bridge *br = netdev_priv(dev);
 
-	netif_carrier_off(dev);
-
 	br_stp_disable_bridge(br);
 	br_multicast_stop(br);