lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <20121228084008.GA1579@minipsycho.orion> Date: Fri, 28 Dec 2012 09:40:08 +0100 From: Jiri Pirko <jiri@...nulli.us> To: Stephen Hemminger <shemminger@...tta.com> Cc: David Miller <davem@...emloft.net>, netdev@...r.kernel.org Subject: Re: [PATCH net-next] bridge: respect RFC2863 operational state Fri, Dec 28, 2012 at 07:28:54AM CET, shemminger@...tta.com wrote: >The bridge link detection should follow the operational state >of the lower device, rather than the carrier bit. This allows devices >like tunnels that are controlled by userspace control plane to work >with bridge STP link management. > > >Signed-off-by: Stephen Hemminger <shemminger@...tta.com> > > >--- a/net/bridge/br_if.c 2012-10-25 09:11:15.627272524 -0700 >+++ b/net/bridge/br_if.c 2012-12-14 08:58:14.329847361 -0800 >@@ -66,14 +66,14 @@ void br_port_carrier_check(struct net_br > struct net_device *dev = p->dev; > struct net_bridge *br = p->br; > >- if (netif_running(dev) && netif_carrier_ok(dev)) >+ if (netif_running(dev) && netif_oper_up(dev)) > p->path_cost = port_cost(dev); > > if (!netif_running(br->dev)) > return; > > spin_lock_bh(&br->lock); >- if (netif_running(dev) && netif_carrier_ok(dev)) { >+ if (netif_running(dev) && netif_oper_up(dev)) > if (p->state == BR_STATE_DISABLED) > br_stp_enable_port(p); > } else { >--- a/net/bridge/br_notify.c 2012-10-25 09:11:15.631272484 -0700 >+++ b/net/bridge/br_notify.c 2012-12-14 08:57:36.954222724 -0800 >@@ -82,7 +82,7 @@ static int br_device_event(struct notifi > break; > > case NETDEV_UP: >- if (netif_carrier_ok(dev) && (br->dev->flags & IFF_UP)) { >+ if (netif_running(br->dev) && netif_oper_up(dev)) { > spin_lock_bh(&br->lock); > br_stp_enable_port(p); > spin_unlock_bh(&br->lock); >-- >To unsubscribe from this list: send the line "unsubscribe netdev" in >the body of a message to majordomo@...r.kernel.org >More majordomo info at http://vger.kernel.org/majordomo-info.html Reviewed-by: Jiri Pirko <jiri@...nulli.us> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists