Attachment 160122 Details for Bug 202502 – Fix the issue and remove workaround from the wpi driver

[patch] Fix the issue and remove workaround from the wpi driver

patch-net80211-ic_curchan.diff (text/plain), 1.40 KB, created by Andriy Voskoboinyk on 2015-08-19 23:38:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Voskoboinyk

Created: 2015-08-19 23:38:57 UTC

Size: 1.40 KB

patch

obsolete

>Index: sys/net80211/ieee80211_proto.c
>===================================================================
>--- sys/net80211/ieee80211_proto.c	(revision 286881)
>+++ sys/net80211/ieee80211_proto.c	(working copy)
>@@ -1248,6 +1248,12 @@
> 		 */
> 		if (ic->ic_nrunning++ == 0 &&
> 		    (parent->if_drv_flags & IFF_DRV_RUNNING) == 0) {
>+			if ((vap->iv_opmode == IEEE80211_M_IBSS &&
>+			     IEEE80211_IS_CHAN_NOADHOC(ic->ic_curchan)) ||
>+			    (vap->iv_opmode == IEEE80211_M_HOSTAP &&
>+			     IEEE80211_IS_CHAN_NOHOSTAP(ic->ic_curchan)))
>+				ic->ic_curchan = &ic->ic_channels[0];
>+
> 			IEEE80211_DPRINTF(vap,
> 			    IEEE80211_MSG_STATE | IEEE80211_MSG_DEBUG,
> 			    "%s: up parent %s\n", __func__, parent->if_xname);
>Index: sys/dev/wpi/if_wpi.c
>===================================================================
>--- sys/dev/wpi/if_wpi.c	(revision 286881)
>+++ sys/dev/wpi/if_wpi.c	(working copy)
>@@ -3960,14 +3960,6 @@
> 	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__);

Actions: View | Diff

Attachments on bug 202502: 160122