aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstephen hemminger <shemminger@vyatta.com>2011-10-03 18:14:45 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-11 09:36:49 -0800
commitce0f562ecf544f386b6ae95f490cd06f7da2deb4 (patch)
tree97e36d61c095c13e8b7d5ef0072dd5c86a5cb6cb
parent621112ec06bbe3a6dbb6af5f4db3451d01b309f9 (diff)
downloadkernel_samsung_tuna-ce0f562ecf544f386b6ae95f490cd06f7da2deb4.zip
kernel_samsung_tuna-ce0f562ecf544f386b6ae95f490cd06f7da2deb4.tar.gz
kernel_samsung_tuna-ce0f562ecf544f386b6ae95f490cd06f7da2deb4.tar.bz2
bridge: leave carrier on for empty bridge
[ Upstream commit b64b73d7d0c480f75684519c6134e79d50c1b341 ] This resolves a regression seen by some users of bridging. Some users use the bridge like a dummy device. They expect to be able to put an IPv6 address on the device with no ports attached. Although there are better ways of doing this, there is no reason to not allow it. Note: the bridge still will reflect the state of ports in the bridge if there are any added. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-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);