Attachment #160122 for bug #202502

View | Details | Raw Unified | Return to bug 202502
Collapse All | Expand All

Lines 1248-1253 Link Here

(-)sys/net80211/ieee80211_proto.c (+6 lines)
1248	*/	1248	*/
1249	if (ic->ic_nrunning++ == 0 &&	1249	if (ic->ic_nrunning++ == 0 &&
1250	(parent->if_drv_flags & IFF_DRV_RUNNING) == 0) {	1250	(parent->if_drv_flags & IFF_DRV_RUNNING) == 0) {
		1251	if ((vap->iv_opmode == IEEE80211_M_IBSS &&
		1252	IEEE80211_IS_CHAN_NOADHOC(ic->ic_curchan)) \|\|
		1253	(vap->iv_opmode == IEEE80211_M_HOSTAP &&
		1254	IEEE80211_IS_CHAN_NOHOSTAP(ic->ic_curchan)))
		1255	ic->ic_curchan = &ic->ic_channels[0];
		1256
1251	IEEE80211_DPRINTF(vap,	1257	IEEE80211_DPRINTF(vap,
1252	IEEE80211_MSG_STATE \| IEEE80211_MSG_DEBUG,	1258	IEEE80211_MSG_STATE \| IEEE80211_MSG_DEBUG,
1253	"%s: up parent %s\n", __func__, parent->if_xname);	1259	"%s: up parent %s\n", __func__, parent->if_xname);




	sc->rxon.cck_mask  = 0x0f;	/* not yet negotiated */
	sc->rxon.ofdm_mask = 0xff;	/* not yet negotiated */

	/* XXX Current configuration may be unusable. */
	if (IEEE80211_IS_CHAN_NOADHOC(c) && sc->rxon.mode == WPI_MODE_IBSS) {
		device_printf(sc->sc_dev,
		    "%s: invalid channel (%d) selected for IBSS mode\n",
		    __func__, ieee80211_chan2ieee(ic, c));
		return EINVAL;
	}

	if ((error = wpi_send_rxon(sc, 0, 0)) != 0) {
		device_printf(sc->sc_dev, "%s: could not send RXON\n",
		    __func__);

Return to bug 202502

Lines 3960-3973 Link Here

(-)sys/dev/wpi/if_wpi.c (-8 lines)
3960	sc->rxon.cck_mask = 0x0f; /* not yet negotiated */	3960	sc->rxon.cck_mask = 0x0f; /* not yet negotiated */
3961	sc->rxon.ofdm_mask = 0xff; /* not yet negotiated */	3961	sc->rxon.ofdm_mask = 0xff; /* not yet negotiated */
3962		3962
3963	/* XXX Current configuration may be unusable. */
3964	if (IEEE80211_IS_CHAN_NOADHOC(c) && sc->rxon.mode == WPI_MODE_IBSS) {
3965	device_printf(sc->sc_dev,
3966	"%s: invalid channel (%d) selected for IBSS mode\n",
3967	__func__, ieee80211_chan2ieee(ic, c));
3968	return EINVAL;
3969	}
3970
3971	if ((error = wpi_send_rxon(sc, 0, 0)) != 0) {	3963	if ((error = wpi_send_rxon(sc, 0, 0)) != 0) {
3972	device_printf(sc->sc_dev, "%s: could not send RXON\n",	3964	device_printf(sc->sc_dev, "%s: could not send RXON\n",
3973	__func__);	3965	__func__);