diff options
| author | Adrian Chadd <adrian@FreeBSD.org> | 2017-07-17 21:32:35 +0000 |
|---|---|---|
| committer | Adrian Chadd <adrian@FreeBSD.org> | 2017-07-17 21:32:35 +0000 |
| commit | 112d57f2ad9f5f2690d889a88bfc3af072d76eb3 (patch) | |
| tree | 129cf914fd93ff14df42f350ce801499a06befd4 | |
| parent | fe845d8e27bf3ebc742d7f8f2f7d1e21a848055d (diff) | |
| download | src-112d57f2ad9f5f2690d889a88bfc3af072d76eb3.tar.gz src-112d57f2ad9f5f2690d889a88bfc3af072d76eb3.zip | |
[iwm] actually use the new rxon function now.
It turns out the /next/ dragonflybsd git actually uses the scan channel list,
so just kick this along to make the next commit easier.
Obtained from: dragonflybsd.git 53a009d6f66108b40d622ed90ea95eba5c0e5432
Notes
Notes:
svn path=/head/; revision=321101
| -rw-r--r-- | sys/dev/iwm/if_iwm_scan.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/dev/iwm/if_iwm_scan.c b/sys/dev/iwm/if_iwm_scan.c index ab047d9b4d91..8fc13f1eb1d1 100644 --- a/sys/dev/iwm/if_iwm_scan.c +++ b/sys/dev/iwm/if_iwm_scan.c @@ -179,7 +179,6 @@ iwm_mvm_scan_rx_chain(struct iwm_softc *sc) return htole16(rx_chain); } -#if 0 static uint32_t iwm_mvm_scan_rxon_flags(struct ieee80211_channel *c) { @@ -188,7 +187,6 @@ iwm_mvm_scan_rxon_flags(struct ieee80211_channel *c) else return htole32(IWM_PHY_BAND_5); } -#endif static uint32_t iwm_mvm_scan_rate_n_flags(struct iwm_softc *sc, int flags, int no_cck) @@ -728,10 +726,7 @@ iwm_mvm_lmac_scan(struct iwm_softc *sc) if (iwm_mvm_rrm_scan_needed(sc)) req->scan_flags |= htole32(IWM_MVM_LMAC_SCAN_FLAGS_RRM_ENABLED); - /* Note - IWM_PHY_BAND_5 is 0 anyway */ - req->flags = htole32(IWM_PHY_BAND_24); - if (sc->nvm_data->sku_cap_band_52GHz_enable) - req->flags |= htole32(IWM_PHY_BAND_5); + req->flags = iwm_mvm_scan_rxon_flags(&sc->sc_ic.ic_channels[0]); req->filter_flags = htole32(IWM_MAC_FILTER_ACCEPT_GRP | IWM_MAC_FILTER_IN_BEACON); |