From patchwork Mon Mar 3 22:47:01 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: 326086 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 5C13A2C0082 for ; Tue, 4 Mar 2014 09:49:39 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755612AbaCCWrZ (ORCPT ); Mon, 3 Mar 2014 17:47:25 -0500 Received: from mail-pb0-f41.google.com ([209.85.160.41]:58086 "EHLO mail-pb0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755565AbaCCWrX (ORCPT ); Mon, 3 Mar 2014 17:47:23 -0500 Received: by mail-pb0-f41.google.com with SMTP id jt11so4376974pbb.28 for ; Mon, 03 Mar 2014 14:47:23 -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=ftsCh3/LnEo7dMte7CP3bkfhwKkdSXNg64/PadgH+Hs=; b=kCl6z4M/fqcoj7FvhxruPdf/ApTfzE3LzCNqZJGlE5Hus3XWdhS5R6H9WEfcATJejk eLacLY1gzmMBRgJLlhNIVKd8BkNp8vXz1CgP74FIoBon+C/csiY8C3YjQ2dEdmz8Gcej W8Ku26RHzMTQBQMSfuDbyGJYFKPCU0WkczrSLne/x91re/PrD/q/4USFpsfgOaLGa86x 7ie9IQOTvxrJP/8R6ZHXsOYZ+j4uuWn/Z4LNoDEpV1n1nwzr/eYK06IgnG0/Ru7/uotC b8sMHTR8kqhgFNKrgYfMnDN2xrF51HMdqON/UCf/Uq+lx/EnMXddxDIty0XVfnNP0Kci s+hw== X-Received: by 10.66.252.135 with SMTP id zs7mr2176103pac.13.1393886843044; Mon, 03 Mar 2014 14:47:23 -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 q7sm40371143pbc.20.2014.03.03.14.47.19 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 03 Mar 2014 14:47:21 -0800 (PST) Received: by mcgrof@gmail.com (sSMTP sendmail emulation); Mon, 03 Mar 2014 14:47:18 -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 2/6] bridge: trigger a bridge calculation upon port changes Date: Mon, 3 Mar 2014 14:47:01 -0800 Message-Id: <1393886825-24323-3-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" 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))