Page MenuHomeFreeBSD
Files F160468732

D56579.id176116.diff
No OneTemporary
Actions

D56579.id176116.diff
View Options

diff --git a/sys/net/ieee8023ad_lacp.c b/sys/net/ieee8023ad_lacp.c
--- a/sys/net/ieee8023ad_lacp.c
+++ b/sys/net/ieee8023ad_lacp.c
@@ -682,6 +682,7 @@
lacp_disable_distributing(struct lacp_port *lp)
{
struct lacp_aggregator *la = lp->lp_aggregator;
+ struct lacp_aggregator *la_active;
struct lacp_softc *lsc = lp->lp_lsc;
struct lagg_softc *sc = lsc->lsc_softc;
char buf[LACP_LAGIDSTR_MAX+1];
@@ -703,7 +704,6 @@
TAILQ_REMOVE(&la->la_ports, lp, lp_dist_q);
la->la_nports--;
- sc->sc_active = la->la_nports;
if (lsc->lsc_active_aggregator == la) {
lacp_suppress_distributing(lsc, la);
@@ -713,6 +713,8 @@
}
lp->lp_state &= ~LACP_STATE_DISTRIBUTING;
+ la_active = lsc->lsc_active_aggregator;
+ sc->sc_active = la_active != NULL ? la_active->la_nports : 0;
if_link_state_change(sc->sc_ifp,
sc->sc_active ? LINK_STATE_UP : LINK_STATE_DOWN);
}
@@ -721,6 +723,7 @@
lacp_enable_distributing(struct lacp_port *lp)
{
struct lacp_aggregator *la = lp->lp_aggregator;
+ struct lacp_aggregator *la_active;
struct lacp_softc *lsc = lp->lp_lsc;
struct lagg_softc *sc = lsc->lsc_softc;
char buf[LACP_LAGIDSTR_MAX+1];
@@ -739,7 +742,6 @@
KASSERT(la->la_refcnt > la->la_nports, ("aggregator refcnt invalid"));
TAILQ_INSERT_HEAD(&la->la_ports, lp, lp_dist_q);
la->la_nports++;
- sc->sc_active = la->la_nports;
lp->lp_state |= LACP_STATE_DISTRIBUTING;
@@ -750,6 +752,8 @@
/* try to become the active aggregator */
lacp_select_active_aggregator(lsc);
+ la_active = lsc->lsc_active_aggregator;
+ sc->sc_active = la_active != NULL ? la_active->la_nports : 0;
if_link_state_change(sc->sc_ifp,
sc->sc_active ? LINK_STATE_UP : LINK_STATE_DOWN);
}

File Metadata

Mime Type
text/plain
Expires
Thu, Jun 25, 8:01 PM (8 h, 4 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32031698
Default Alt Text
D56579.id176116.diff (1 KB)

Event Timeline