diff options
| author | adrian <adrian@FreeBSD.org> | 2013-01-31 00:14:25 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2013-01-31 00:14:25 +0000 |
| commit | e33dc79d8ee6e651f229bdeddaa7109185cb20db (patch) | |
| tree | 7979c3cda6f59cad88ebdab892dec7d5f35d253c | |
| parent | a236fc7fcc3822483877a07e7a3e395013f66e2c (diff) | |
| download | FreeBSD-src-e33dc79d8ee6e651f229bdeddaa7109185cb20db.zip FreeBSD-src-e33dc79d8ee6e651f229bdeddaa7109185cb20db.tar.gz | |
Work around some rather unfortunate race conditions inside net80211.
Right now, ic_curchan seems to be updated rather quickly (ie, during
the ioctl) and before the driver gets notified of what's going on.
So what I was seeing was:
* NIC was in channel X;
* It generates PHY errors for channel X;
* an ioctl comes along from userland and changes things to channel Y;
* .. this updates ic_curchan, but hasn't yet reset the hardware;
* in parallel, RX is occuring and it looks at ic_curchan;
* .. which is channel Y, so events get stamped with that now.
Sigh.
| -rw-r--r-- | sys/dev/ath/if_ath_rx.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/ath/if_ath_rx.c b/sys/dev/ath/if_ath_rx.c index 368c05c..c8d9536 100644 --- a/sys/dev/ath/if_ath_rx.c +++ b/sys/dev/ath/if_ath_rx.c @@ -431,18 +431,16 @@ ath_rx_tap(struct ifnet *ifp, struct mbuf *m, #ifdef AH_SUPPORT_AR5416 sc->sc_rx_th.wr_chan_flags &= ~CHAN_HT; if (rs->rs_status & HAL_RXERR_PHY) { - struct ieee80211com *ic = ifp->if_l2com; - /* * PHY error - make sure the channel flags * reflect the actual channel configuration, * not the received frame. */ - if (IEEE80211_IS_CHAN_HT40U(ic->ic_curchan)) + if (IEEE80211_IS_CHAN_HT40U(sc->sc_curchan)) sc->sc_rx_th.wr_chan_flags |= CHAN_HT40U; - else if (IEEE80211_IS_CHAN_HT40D(ic->ic_curchan)) + else if (IEEE80211_IS_CHAN_HT40D(sc->sc_curchan)) sc->sc_rx_th.wr_chan_flags |= CHAN_HT40D; - else if (IEEE80211_IS_CHAN_HT20(ic->ic_curchan)) + else if (IEEE80211_IS_CHAN_HT20(sc->sc_curchan)) sc->sc_rx_th.wr_chan_flags |= CHAN_HT20; } else if (sc->sc_rx_th.wr_rate & IEEE80211_RATE_MCS) { /* HT rate */ struct ieee80211com *ic = ifp->if_l2com; |
