Attachment #217697 for bug #248955

Lines 3549-3555 ath_media_change(struct ifnet *ifp) Link Here

(-)b/sys/dev/ath/if_ath.c (-1 / +1 lines)
3549	{	3549	{
3550	int error = ieee80211_media_change(ifp);	3550	int error = ieee80211_media_change(ifp);
3551	/* NB: only the fixed rate can change and that doesn't need a reset */	3551	/* NB: only the fixed rate can change and that doesn't need a reset */
3552	return (error == ENETRESET ? 0 : error);	3552	return (error);
3553	}	3553	}
3554		3554
3555	/*	3555	/*

Lines 1814-1820 bwi_media_change(struct ifnet *ifp) Link Here

(-)b/sys/dev/bwi/if_bwi.c (-1 / +1 lines)
1814	{	1814	{
1815	int error = ieee80211_media_change(ifp);	1815	int error = ieee80211_media_change(ifp);
1816	/* NB: only the fixed rate can change and that doesn't need a reset */	1816	/* NB: only the fixed rate can change and that doesn't need a reset */
1817	return (error == ENETRESET ? 0 : error);	1817	return (error);
1818	}	1818	}
1819		1819
1820	static int	1820	static int

Lines 4426-4432 iwm_media_change(struct ifnet *ifp) Link Here

(-)b/sys/dev/iwm/if_iwm.c (-1 / +1 lines)
4426	int error;	4426	int error;
4427		4427
4428	error = ieee80211_media_change(ifp);	4428	error = ieee80211_media_change(ifp);
4429	if (error != ENETRESET)	4429	if (error != 0)
4430	return error;	4430	return error;
4431		4431
4432	IWM_LOCK(sc);	4432	IWM_LOCK(sc);

Lines 2886-2896 iwn_newassoc(struct ieee80211_node *ni, int isnew) Link Here

(-)b/sys/dev/iwn/if_iwn.c (-4 / +2 lines)
2886	static int	2886	static int
2887	iwn_media_change(struct ifnet *ifp)	2887	iwn_media_change(struct ifnet *ifp)
2888	{	2888	{
2889	int error;	2889	int error = ieee80211_media_change(ifp);
2890
2891	error = ieee80211_media_change(ifp);
2892	/* NB: only the fixed rate can change and that doesn't need a reset */	2890	/* NB: only the fixed rate can change and that doesn't need a reset */
2893	return (error == ENETRESET ? 0 : error);	2891	return error;
2894	}	2892	}
2895		2893
2896	static int	2894	static int




mwl_media_change(struct ifnet *ifp)
{
	struct ieee80211vap *vap = ifp->if_softc;
	int error = ieee80211_media_change(ifp);

	error = ieee80211_media_change(ifp);
	/* NB: only the fixed rate can change and that doesn't need a reset */
	if (error == 0)
	  mwl_setrates(vap);
		error = 0;
	}
	return error;
}


Lines 2126-2132 run_media_change(struct ifnet *ifp) Link Here

(-)b/sys/dev/usb/wlan/if_run.c (-1 / +1 lines)
2126	RUN_LOCK(sc);	2126	RUN_LOCK(sc);
2127		2127
2128	error = ieee80211_media_change(ifp);	2128	error = ieee80211_media_change(ifp);
2129	if (error != ENETRESET) {	2129	if (error != 0) {
2130	RUN_UNLOCK(sc);	2130	RUN_UNLOCK(sc);
2131	return (error);	2131	return (error);
2132	}	2132	}

Lines 157-163 wtap_media_change(struct ifnet *ifp) Link Here

(-)b/sys/dev/wtap/if_wtap.c (-2 / +1 lines)
157	DWTAP_PRINTF("%s\n", __func__);	157	DWTAP_PRINTF("%s\n", __func__);
158	int error = ieee80211_media_change(ifp);	158	int error = ieee80211_media_change(ifp);
159	/* NB: only the fixed rate can change and that doesn't need a reset */	159	/* NB: only the fixed rate can change and that doesn't need a reset */
160	return (error == ENETRESET ? 0 : error);	160	return (error);
161	}	161	}
162		162
163	/*	163	/*
164	-

Return to bug 248955

Lines 1472-1485 static int Link Here

(-)b/sys/dev/mwl/if_mwl.c (-7 / +3 lines)
1472	mwl_media_change(struct ifnet *ifp)	1472	mwl_media_change(struct ifnet *ifp)
1473	{	1473	{
1474	struct ieee80211vap *vap = ifp->if_softc;	1474	struct ieee80211vap *vap = ifp->if_softc;
1475	int error;	1475	int error = ieee80211_media_change(ifp);
1476
1477	error = ieee80211_media_change(ifp);
1478	/* NB: only the fixed rate can change and that doesn't need a reset */	1476	/* NB: only the fixed rate can change and that doesn't need a reset */
1479	if (error == ENETRESET) {	1477	if (error == 0)
1480	mwl_setrates(vap);	1478	mwl_setrates(vap);
1481	error = 0;
1482	}
1483	return error;	1479	return error;
1484	}	1480	}
1485		1481