diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-07 01:15:10 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-07 01:15:10 +0200 |
| commit | 3ee72ca99288f1de95ec9c570e43f531c8799f06 (patch) | |
| tree | 1199d129cb94b128eb6029d5fcc3ff0d4900b067 /net/bridge | |
| parent | x86/PCI: use host bridge _CRS info on ASUS M2V-MX SE (diff) | |
| parent | net: fix typos in Documentation/networking/scaling.txt (diff) | |
| download | linux-3ee72ca99288f1de95ec9c570e43f531c8799f06.tar.xz linux-3ee72ca99288f1de95ec9c570e43f531c8799f06.zip | |
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.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index 32b8f9f7f79e..ff3ed6086ce1 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); |