summaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-06 16:15:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-06 16:15:10 -0700
commit3ee72ca99288f1de95ec9c570e43f531c8799f06 (patch)
tree1199d129cb94b128eb6029d5fcc3ff0d4900b067 /net/bridge
parent29cf7a30f8a0ce4af2406d93d5a332099be26923 (diff)
parent186c6bbced722cfeff041d2a1264c95f5d042050 (diff)
downloadop-kernel-dev-3ee72ca99288f1de95ec9c570e43f531c8799f06.zip
op-kernel-dev-3ee72ca99288f1de95ec9c570e43f531c8799f06.tar.gz
Merge git://github.com/davem330/net
* git://github.com/davem330/net: net: fix typos in Documentation/networking/scaling.txt bridge: leave carrier on for empty bridge netfilter: Use proper rwlock init function tcp: properly update lost_cnt_hint during shifting tcp: properly handle md5sig_pool references macvlan/macvtap: Fix unicast between macvtap interfaces in bridge mode
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/br_device.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index 32b8f9f..ff3ed60 100644
--- a/net/bridge/br_device.c
+++ b/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);
OpenPOWER on IntegriCloud