From patchwork Mon Mar 3 22:47:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luis R. Rodriguez" X-Patchwork-Id: 326087 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 B726E2C00AB for ; Tue, 4 Mar 2014 09:50:03 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755580AbaCCWrV (ORCPT ); Mon, 3 Mar 2014 17:47:21 -0500 Received: from mail-pa0-f54.google.com ([209.85.220.54]:39702 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755565AbaCCWrT (ORCPT ); Mon, 3 Mar 2014 17:47:19 -0500 Received: by mail-pa0-f54.google.com with SMTP id lf10so1687506pab.27 for ; Mon, 03 Mar 2014 14:47:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=VZKXKzSxivtwcFiuGJGt5848K3ojueItUITXs3njbZ8=; b=F2V5YO98IYEhW/Rgitog0FqBeHAF0bpDp/SAAJe2WtrmCC0gg3Ik1S+FlqaQ/vklwR jpVOOYH5W4LNIFMOYe2C7VF1m8MgEE9otYiawfspP+YB1OG8YhPBCRle2Tn+gAi/6B/H 6qjkJE4dBiBXrtsoZnN3rFjsoxfPRH3vIgJifOfRfolJHD1Lhl8uQQVD4wq1g27H9YJf yyq3tNgJ1BxFfHnY+1TIUYPtnDcHKOL7rV/XIkfyVAQZjhRhx8wtPrBPBSi27/wq9GGA ea+4LvHdyTzQTvsjLB2Q4jk61QunF29ny366xXeEtTG5TEiVYDcKa+6SUGqqbtACXWBj /mRg== X-Received: by 10.68.143.196 with SMTP id sg4mr5846831pbb.155.1393886838549; Mon, 03 Mar 2014 14:47:18 -0800 (PST) Received: from mcgrof@gmail.com (c-24-7-61-223.hsd1.ca.comcast.net. [24.7.61.223]) by mx.google.com with ESMTPSA id zb2sm32399045pbc.30.2014.03.03.14.47.15 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 03 Mar 2014 14:47:17 -0800 (PST) Received: by mcgrof@gmail.com (sSMTP sendmail emulation); Mon, 03 Mar 2014 14:47:14 -0800 From: "Luis R. Rodriguez" To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, mcgrof@suse.com, Stephen Hemminger , bridge@lists.linux-foundation.org Subject: [RFC v3 1/6] bridge: preserve random init MAC address Date: Mon, 3 Mar 2014 14:47:00 -0800 Message-Id: <1393886825-24323-2-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1393886825-24323-1-git-send-email-mcgrof@do-not-panic.com> References: <1393886825-24323-1-git-send-email-mcgrof@do-not-panic.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: "Luis R. Rodriguez" As it is now if you add create a bridge it gets started with a random MAC address and if you then add a net_device as a slave but later kick it out you end up with a zero MAC address. Instead preserve the original random MAC address and use it. If you manually set the bridge address that will always be respected. This change only takes effect if at the time of computing the new root port we determine we have found no candidates. Cc: Stephen Hemminger Cc: bridge@lists.linux-foundation.org Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: xen-devel@lists.xenproject.org Cc: kvm@vger.kernel.org Signed-off-by: Luis R. Rodriguez --- net/bridge/br_device.c | 1 + net/bridge/br_private.h | 1 + net/bridge/br_stp_if.c | 3 +++ 3 files changed, 5 insertions(+) diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index b063050..5f13eac 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -368,6 +368,7 @@ void br_dev_setup(struct net_device *dev) br->bridge_id.prio[1] = 0x00; ether_addr_copy(br->group_addr, eth_reserved_addr_base); + ether_addr_copy(br->random_init_addr, dev->dev_addr); br->stp_enabled = BR_NO_STP; br->group_fwd_mask = BR_GROUPFWD_DEFAULT; diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index e1ca1dc..32a06da 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -240,6 +240,7 @@ struct net_bridge unsigned long bridge_hello_time; unsigned long bridge_forward_delay; + u8 random_init_addr[ETH_ALEN]; u8 group_addr[ETH_ALEN]; u16 root_port; diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c index 189ba1e..4c9ad45 100644 --- a/net/bridge/br_stp_if.c +++ b/net/bridge/br_stp_if.c @@ -239,6 +239,9 @@ bool br_stp_recalculate_bridge_id(struct net_bridge *br) if (ether_addr_equal(br->bridge_id.addr, addr)) return false; /* no change */ + if (ether_addr_equal(addr, br_mac_zero)) + addr = br->random_init_addr; + br_stp_change_bridge_id(br, addr); return true; }