From patchwork Fri Sep 2 17:22:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 113174 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8FE2AB6F81 for ; Sat, 3 Sep 2011 03:34:40 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753960Ab1IBRea (ORCPT ); Fri, 2 Sep 2011 13:34:30 -0400 Received: from sfca-50.vyatta.com ([76.74.103.50]:48254 "EHLO fiji.vyatta.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753906Ab1IBRe2 (ORCPT ); Fri, 2 Sep 2011 13:34:28 -0400 Received: by fiji.vyatta.com (Postfix, from userid 1051) id EE5B31542F9; Fri, 2 Sep 2011 10:21:19 -0700 (PDT) Message-Id: <20110902172247.396753508@vyatta.com> User-Agent: quilt/0.48-1 Date: Fri, 02 Sep 2011 10:22:21 -0700 From: Stephen Hemminger To: "David S. Miller" Cc: netdev@vger.kernel.org Subject: [PATCH 1/2] bridge: leave carrier on for empty bridge References: <20110902172220.830228928@vyatta.com> Content-Disposition: inline; filename=br-carrier-default.patch Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 during boot. Note: the bridge still will reflect the state of ports in the bridge if there are any added. Signed-off-by: Stephen Hemminger --- This fix needs to go to stable for 3.0 and 2.6.39 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/net/bridge/br_device.c 2011-09-01 08:52:27.596631192 -0700 +++ b/net/bridge/br_device.c 2011-09-01 09:01:03.256611801 -0700 @@ -91,7 +91,6 @@ static int br_dev_open(struct net_device { 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 { struct net_bridge *br = netdev_priv(dev); - netif_carrier_off(dev); - br_stp_disable_bridge(br); br_multicast_stop(br);