aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorArnaud Ysmal <arnaud.ysmal@stormshield.eu>2021-09-23 08:57:11 +0000
committerWojciech Macek <wma@FreeBSD.org>2021-09-23 08:57:11 +0000
commit0b92a7fe47a5f7148a494514bfa530ddc6b496bf (patch)
tree2a87c653cf739569166417531c68445cc8798e1b /sys
parent492bf4fdad4dbb96b82d88e12918e61042f71661 (diff)
downloadsrc-0b92a7fe47a5f7148a494514bfa530ddc6b496bf.tar.gz
src-0b92a7fe47a5f7148a494514bfa530ddc6b496bf.zip
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
Diffstat (limited to 'sys')
-rw-r--r--sys/net/ieee8023ad_lacp.c3
1 files changed, 2 insertions, 1 deletions
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 */