d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bug that caused reinitialization failure of MAC addresses on

Browse Source 
the lagg interface when removing the primary port.

PR:			201916
Differential Revision:	https://reviews.freebsd.org/D3301
This commit is contained in:
Hiroki Sato 2015-10-07 06:32:34 +00:00
parent c99a4e8a47
commit 023d10cbc7
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/net/if_lagg.c
View File

@ -640,7 +640,7 @@ lagg_port_lladdr(struct lagg_port *lp, uint8_t *lladdr)
/* Check to make sure its not already queued to be changed */ /* Check to make sure its not already queued to be changed */
SLIST_FOREACH(llq, &sc->sc_llq_head, llq_entries) { SLIST_FOREACH(llq, &sc->sc_llq_head, llq_entries) {
if (llq->llq_ifp == ifp) { if (llq->llq_ifp == ifp && llq->llq_primary == primary) {
pending = 1; pending = 1;
break; break;
} }
@ -855,7 +855,7 @@ static int
lagg_port_destroy(struct lagg_port *lp, int rundelport) lagg_port_destroy(struct lagg_port *lp, int rundelport)
{ {
struct lagg_softc *sc = lp->lp_softc; struct lagg_softc *sc = lp->lp_softc;
struct lagg_port *lp_ptr; struct lagg_port *lp_ptr, *lp0;
struct lagg_llq *llq; struct lagg_llq *llq;
struct ifnet *ifp = lp->lp_ifp; struct ifnet *ifp = lp->lp_ifp;
uint64_t *pval, vdiff; uint64_t *pval, vdiff;
@ -897,18 +897,26 @@ lagg_port_destroy(struct lagg_port *lp, int rundelport)
if (lp == sc->sc_primary) { if (lp == sc->sc_primary) {
uint8_t lladdr[ETHER_ADDR_LEN]; uint8_t lladdr[ETHER_ADDR_LEN];
if ((lp_ptr = SLIST_FIRST(&sc->sc_ports)) == NULL) { if ((lp0 = SLIST_FIRST(&sc->sc_ports)) == NULL) {
bzero(&lladdr, ETHER_ADDR_LEN); bzero(&lladdr, ETHER_ADDR_LEN);
} else { } else {
bcopy(lp_ptr->lp_lladdr, bcopy(lp0->lp_lladdr,
lladdr, ETHER_ADDR_LEN); lladdr, ETHER_ADDR_LEN);
} }
lagg_lladdr(sc, lladdr); lagg_lladdr(sc, lladdr);
sc->sc_primary = lp_ptr;
/* Update link layer address for each port */ /*
* Update link layer address for each port. No port is
* marked as primary at this moment.
*/
SLIST_FOREACH(lp_ptr, &sc->sc_ports, lp_entries) SLIST_FOREACH(lp_ptr, &sc->sc_ports, lp_entries)
lagg_port_lladdr(lp_ptr, lladdr); lagg_port_lladdr(lp_ptr, lladdr);
/*
* Mark lp0 as the new primary. This invokes an
* iflladdr_event.
*/
sc->sc_primary = lp0;
lagg_port_lladdr(lp0, lladdr);
} }
/* Remove any pending lladdr changes from the queue */ /* Remove any pending lladdr changes from the queue */