git: 0b92a7fe47a5 - main - LACP: Do not wait response for marker messages not sent

[Wojciech Macek]

The branch main has been updated by wma:

URL: https://cgit.FreeBSD.org/src/commit/?id=0b92a7fe47a5f7148a494514bfa530ddc6b496bf

commit 0b92a7fe47a5f7148a494514bfa530ddc6b496bf
Author:     Arnaud Ysmal <arnaud.ysmal at stormshield.eu>
AuthorDate: 2021-09-23 08:57:11 +0000
Commit:     Wojciech Macek <wma at FreeBSD.org>
CommitDate: 2021-09-23 08:57:11 +0000

    LACP: Do not wait response for marker messages not sent
    
    The error returned when a marker message can not be emitted on a port is not handled.
    
    This cause the lacp to block all emissions until the timeout of 3 seconds is reached.
    
    To fix this issue, I just clear the LACP_PORT_MARK flag when the packet could not be emitted.
    
    Differential revision:  https://reviews.freebsd.org/D30467
    Obtained from:          Stormshield
---
 sys/net/ieee8023ad_lacp.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys/net/ieee8023ad_lacp.c b/sys/net/ieee8023ad_lacp.c
index bdc6113ce2a0..cf07890e051f 100644
--- a/sys/net/ieee8023ad_lacp.c
+++ b/sys/net/ieee8023ad_lacp.c
@@ -919,7 +919,8 @@ lacp_suppress_distributing(struct lacp_softc *lsc, struct lacp_aggregator *la)
 	/* send a marker frame down each port to verify the queues are empty */
 	LIST_FOREACH(lp, &lsc->lsc_ports, lp_next) {
 		lp->lp_flags |= LACP_PORT_MARK;
-		lacp_xmit_marker(lp);
+		if (lacp_xmit_marker(lp) != 0)
+			lp->lp_flags &= ~LACP_PORT_MARK;
 	}
 
 	/* set a timeout for the marker frames */