From 33d79d5d2b6cfd57fbe0733f66784fac658cb360 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sun, 18 Mar 2018 17:11:16 +0200 Subject: [lacp] Mark link as blocked if partner is not yet up and running Mark the link as blocked if the LACP partner is not reporting itself as being in sync, collecting, and distributing. This matches the behaviour for STP: we mark the link as blocked if we detect that the switch is actively blocking traffic, in order to extend the DHCP discovery period and so prevent boot failures on switches that take an excessively long time to enable ports. Signed-off-by: Michael Brown --- src/net/eth_slow.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'src/net') diff --git a/src/net/eth_slow.c b/src/net/eth_slow.c index 049c26cb..41ce79fe 100644 --- a/src/net/eth_slow.c +++ b/src/net/eth_slow.c @@ -27,6 +27,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); #include #include #include +#include #include #include #include @@ -148,9 +149,30 @@ static int eth_slow_lacp_rx ( struct io_buffer *iobuf, struct net_device *netdev ) { union eth_slow_packet *eth_slow = iobuf->data; struct eth_slow_lacp *lacp = ð_slow->lacp; + unsigned int interval; eth_slow_lacp_dump ( iobuf, netdev, "RX" ); + /* If partner is not in sync, collecting, and distributing, + * then block the link until after the next expected LACP + * packet. + */ + if ( ~lacp->partner.state & ( LACP_STATE_IN_SYNC | + LACP_STATE_COLLECTING | + LACP_STATE_DISTRIBUTING ) ) { + DBGC ( netdev, "SLOW %s LACP partner is down\n", netdev->name ); + interval = ( ( lacp->partner.state & LACP_STATE_FAST ) ? + ( ( LACP_INTERVAL_FAST + 1 ) * TICKS_PER_SEC ) : + ( ( LACP_INTERVAL_SLOW + 1 ) * TICKS_PER_SEC ) ); + netdev_link_block ( netdev, interval ); + } else { + if ( netdev_link_blocked ( netdev ) ) { + DBGC ( netdev, "SLOW %s LACP partner is up\n", + netdev->name ); + } + netdev_link_unblock ( netdev ); + } + /* Build response */ memset ( lacp->reserved, 0, sizeof ( lacp->reserved ) ); memset ( &lacp->terminator, 0, sizeof ( lacp->terminator ) ); -- cgit v1.2.3-55-g7522