From patchwork Thu Mar 13 03:15:26 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: 329781 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 7EDC52C00B5 for ; Thu, 13 Mar 2014 14:16:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753277AbaCMDPs (ORCPT ); Wed, 12 Mar 2014 23:15:48 -0400 Received: from mail-pb0-f50.google.com ([209.85.160.50]:41185 "EHLO mail-pb0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752715AbaCMDPq (ORCPT ); Wed, 12 Mar 2014 23:15:46 -0400 Received: by mail-pb0-f50.google.com with SMTP id md12so445467pbc.37 for ; Wed, 12 Mar 2014 20:15:46 -0700 (PDT) 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=NYsundaaKCSD/R6+ClUpACemZpnvgYxl80qw1WR3thQ=; b=flkHso79VcnuWgypsakhdssUaMieXkiEFhQLto0zMK5TIyM7C5jAXh1Jnxp5msMiP/ 3cj6So7X+SokkS9TcnlkNoC8r/zFv47kIxdl7za81T3p1mA7HQW8RXoyMybzouCZbQGz z9snyRhtWj6huF7tT4Xfbip4MgV6esRHypd2zetZIQ+B+dmoYYY6Xt2Wv288iHouzhKi E29cCpeQAMBCME6tbpz+9y+5twKTyu4AIiAgE6yQ+ZasJ6MCOjs/TfOWrcZbftEiNR5m KxBq6f27qMXguZCFgj3iXdlnIHfAep5oCEf6yi9ovZVqifpdRnHDKCqhtCQlBWfA9jBY yjDg== X-Received: by 10.66.142.132 with SMTP id rw4mr1483868pab.6.1394680546145; Wed, 12 Mar 2014 20:15:46 -0700 (PDT) Received: from mcgrof@gmail.com (c-98-234-145-61.hsd1.ca.comcast.net. [98.234.145.61]) by mx.google.com with ESMTPSA id rk15sm2216124pab.37.2014.03.12.20.15.42 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 12 Mar 2014 20:15:44 -0700 (PDT) Received: by mcgrof@gmail.com (sSMTP sendmail emulation); Wed, 12 Mar 2014 20:15:41 -0700 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: [PATCH 2/3] bridge: trigger a bridge calculation upon port changes Date: Wed, 12 Mar 2014 20:15:26 -0700 Message-Id: <1394680527-28970-3-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1394680527-28970-1-git-send-email-mcgrof@do-not-panic.com> References: <1394680527-28970-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" If netlink is used to tune a port we currently don't trigger a new recalculation of the bridge id, ensure that happens just as if we're adding a new net_device onto the bridge. 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_netlink.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index e74b6d53..6f1b26d 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -364,6 +364,7 @@ int br_setlink(struct net_device *dev, struct nlmsghdr *nlh) struct net_bridge_port *p; struct nlattr *tb[IFLA_BRPORT_MAX + 1]; int err = 0; + bool changed; protinfo = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_PROTINFO); afspec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC); @@ -386,7 +387,12 @@ int br_setlink(struct net_device *dev, struct nlmsghdr *nlh) spin_lock_bh(&p->br->lock); err = br_setport(p, tb); + changed = br_stp_recalculate_bridge_id(p->br); spin_unlock_bh(&p->br->lock); + if (changed) + call_netdevice_notifiers(NETDEV_CHANGEADDR, + p->br->dev); + netdev_update_features(p->br->dev); } else { /* Binary compatibility with old RSTP */ if (nla_len(protinfo) < sizeof(u8))