[Xen-devel] [RFC v3 2/6] bridge: trigger a bridge calculation upon port changes

["Luis R. Rodriguez" <mcgrof@xxxxxxxxxxxxxxxx>]

From: "Luis R. Rodriguez" <mcgrof@xxxxxxxx>

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 <stephen@xxxxxxxxxxxxxxxxxx>
Cc: bridge@xxxxxxxxxxxxxxxxxxxxxxxxxx
Cc: netdev@xxxxxxxxxxxxxxx
Cc: linux-kernel@xxxxxxxxxxxxxxx
Cc: xen-devel@xxxxxxxxxxxxxxxxxxxx
Cc: kvm@xxxxxxxxxxxxxxx
Signed-off-by: Luis R. Rodriguez <mcgrof@xxxxxxxx>
---
 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))
-- 
1.9.0


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel