Attachment #201200 for bug #234846

Lines 566-572 Link Here

(-)sys/net/ieee8023ad_lacp.c (-1 lines)
566	lp->lp_aggregator = NULL;	566	lp->lp_aggregator = NULL;
567	lacp_sm_rx_set_expired(lp);	567	lacp_sm_rx_set_expired(lp);
568	LACP_UNLOCK(lsc);	568	LACP_UNLOCK(lsc);
569	lacp_linkstate(lgp);
570		569
571	return (0);	570	return (0);
572	}	571	}




		    ifp->if_index))
			break;
	}
	LAGG_RUNLOCK();
	if (tlp != NULL)
		CK_SLIST_INSERT_AFTER(tlp, lp, lp_entries);
	else

		lagg_port_destroy(lp, 0);
		if (oldmtu != -1)
			(*ifp->if_ioctl)(ifp, SIOCSIFMTU, (caddr_t)&ifr);
		LAGG_RUNLOCK();
		return (error);
	}
	LAGG_RUNLOCK();

	/* Update lagg capabilities */
	lagg_proto_linkstate(sc, lp);
	lagg_capabilities(sc);
	lagg_linkstate(sc);



	LAGG_XLOCK_ASSERT(sc);

	LAGG_RLOCK();
	if (rundelport)
		lagg_proto_delport(sc, lp);


	/* Finally, remove the port from the lagg */
	CK_SLIST_REMOVE(&sc->sc_ports, lp, lagg_port, lp_entries);
	sc->sc_count--;
	LAGG_RUNLOCK();

	/* Update the primary interface */
	if (lp == sc->sc_primary) {

Return to bug 234846

Lines 759-765 Link Here

(-)sys/net/if_lagg.c (-1 / +5 lines)
759	ifp->if_index))	759	ifp->if_index))
760	break;	760	break;
761	}	761	}
762	LAGG_RUNLOCK();
763	if (tlp != NULL)	762	if (tlp != NULL)
764	CK_SLIST_INSERT_AFTER(tlp, lp, lp_entries);	763	CK_SLIST_INSERT_AFTER(tlp, lp, lp_entries);
765	else	764	else
Lines 774-783 Link Here
774	lagg_port_destroy(lp, 0);	773	lagg_port_destroy(lp, 0);
775	if (oldmtu != -1)	774	if (oldmtu != -1)
776	(*ifp->if_ioctl)(ifp, SIOCSIFMTU, (caddr_t)&ifr);	775	(*ifp->if_ioctl)(ifp, SIOCSIFMTU, (caddr_t)&ifr);
		776	LAGG_RUNLOCK();
777	return (error);	777	return (error);
778	}	778	}
		779	LAGG_RUNLOCK();
779		780
780	/* Update lagg capabilities */	781	/* Update lagg capabilities */
		782	lagg_proto_linkstate(sc, lp);
781	lagg_capabilities(sc);	783	lagg_capabilities(sc);
782	lagg_linkstate(sc);	784	lagg_linkstate(sc);
783		785
Lines 828-833 Link Here
828		830
829	LAGG_XLOCK_ASSERT(sc);	831	LAGG_XLOCK_ASSERT(sc);
830		832
		833	LAGG_RLOCK();
831	if (rundelport)	834	if (rundelport)
832	lagg_proto_delport(sc, lp);	835	lagg_proto_delport(sc, lp);
833		836
Lines 850-855 Link Here
850	/* Finally, remove the port from the lagg */	853	/* Finally, remove the port from the lagg */
851	CK_SLIST_REMOVE(&sc->sc_ports, lp, lagg_port, lp_entries);	854	CK_SLIST_REMOVE(&sc->sc_ports, lp, lagg_port, lp_entries);
852	sc->sc_count--;	855	sc->sc_count--;
		856	LAGG_RUNLOCK();
853		857
854	/* Update the primary interface */	858	/* Update the primary interface */
855	if (lp == sc->sc_primary) {	859	if (lp == sc->sc_primary) {