diff options
| author |   Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2018-05-03 13:47:24 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-05-03 13:40:54 -0400 |
| commit | faa1cd8298439cf56f7fd2d8647726b30c263bf0 (patch) | |
| tree | 651cbd227fc7cb4252c03f66a07f608a9a31378a /net/bridge/br_if.c | |
| parent | Merge branch 'selftests-forwarding-sysctl' (diff) | |
| download | linux-dev-faa1cd8298439cf56f7fd2d8647726b30c263bf0.tar.xz linux-dev-faa1cd8298439cf56f7fd2d8647726b30c263bf0.zip | |
net: bridge: avoid duplicate notification on up/down/change netdev events
While handling netdevice events, br_device_event() sometimes uses
br_stp_(disable|enable)_port which unconditionally send a notification,
but then a second notification for the same event is sent at the end of
the br_device_event() function. To avoid sending duplicate notifications
in such cases, check if one has already been sent (i.e.
br_stp_enable/disable_port have been called).
The patch is based on a change by Satish Ashok.
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/bridge/br_if.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 82c1a6f430b3..e3a8ea1bcbe2 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -64,7 +64,7 @@ static int port_cost(struct net_device *dev) /* Check for port carrier transitions. */ -void br_port_carrier_check(struct net_bridge_port *p) +void br_port_carrier_check(struct net_bridge_port *p, bool *notified) { struct net_device *dev = p->dev; struct net_bridge *br = p->br; @@ -73,16 +73,21 @@ void br_port_carrier_check(struct net_bridge_port *p) netif_running(dev) && netif_oper_up(dev)) p->path_cost = port_cost(dev); + *notified = false; if (!netif_running(br->dev)) return; spin_lock_bh(&br->lock); if (netif_running(dev) && netif_oper_up(dev)) { - if (p->state == BR_STATE_DISABLED) + if (p->state == BR_STATE_DISABLED) { br_stp_enable_port(p); + *notified = true; + } } else { - if (p->state != BR_STATE_DISABLED) + if (p->state != BR_STATE_DISABLED) { br_stp_disable_port(p); + *notified = true; + } } spin_unlock_bh(&br->lock); } |