mac80211: rename single hw-scan flag to follow naming convention
The naming convention is to always have the flags prefixed with IEEE80211_HW_ so they're 'namespaced', make this flag follow it. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
parent
ea1b2b45f5
commit
c526a46767
|
@ -450,7 +450,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
|
|||
!iwlwifi_mod_params.sw_crypto)
|
||||
hw->flags |= IEEE80211_HW_MFP_CAPABLE;
|
||||
|
||||
hw->flags |= IEEE80211_SINGLE_HW_SCAN_ON_ALL_BANDS;
|
||||
hw->flags |= IEEE80211_HW_SINGLE_SCAN_ON_ALL_BANDS;
|
||||
hw->wiphy->features |=
|
||||
NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR |
|
||||
NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR;
|
||||
|
|
|
@ -1885,7 +1885,7 @@ struct ieee80211_txq {
|
|||
* @IEEE80211_HW_SUPPORTS_CLONED_SKBS: The driver will never modify the payload
|
||||
* or tailroom of TX skbs without copying them first.
|
||||
*
|
||||
* @IEEE80211_SINGLE_HW_SCAN_ON_ALL_BANDS: The HW supports scanning on all bands
|
||||
* @IEEE80211_HW_SINGLE_SCAN_ON_ALL_BANDS: The HW supports scanning on all bands
|
||||
* in one command, mac80211 doesn't have to run separate scans per band.
|
||||
*/
|
||||
enum ieee80211_hw_flags {
|
||||
|
@ -1917,7 +1917,7 @@ enum ieee80211_hw_flags {
|
|||
IEEE80211_HW_SUPPORTS_HT_CCK_RATES = 1<<27,
|
||||
IEEE80211_HW_CHANCTX_STA_CSA = 1<<28,
|
||||
IEEE80211_HW_SUPPORTS_CLONED_SKBS = 1<<29,
|
||||
IEEE80211_SINGLE_HW_SCAN_ON_ALL_BANDS = 1<<30,
|
||||
IEEE80211_HW_SINGLE_SCAN_ON_ALL_BANDS = 1<<30,
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
@ -257,7 +257,7 @@ static bool ieee80211_prep_hw_scan(struct ieee80211_local *local)
|
|||
if (test_bit(SCAN_HW_CANCELLED, &local->scanning))
|
||||
return false;
|
||||
|
||||
if (local->hw.flags & IEEE80211_SINGLE_HW_SCAN_ON_ALL_BANDS) {
|
||||
if (local->hw.flags & IEEE80211_HW_SINGLE_SCAN_ON_ALL_BANDS) {
|
||||
for (i = 0; i < req->n_channels; i++) {
|
||||
local->hw_scan_req->req.channels[i] = req->channels[i];
|
||||
bands_used |= BIT(req->channels[i]->band);
|
||||
|
@ -326,7 +326,7 @@ static void __ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted)
|
|||
return;
|
||||
|
||||
if (hw_scan && !aborted &&
|
||||
!(local->hw.flags & IEEE80211_SINGLE_HW_SCAN_ON_ALL_BANDS) &&
|
||||
!(local->hw.flags & IEEE80211_HW_SINGLE_SCAN_ON_ALL_BANDS) &&
|
||||
ieee80211_prep_hw_scan(local)) {
|
||||
int rc;
|
||||
|
||||
|
@ -520,7 +520,7 @@ static int __ieee80211_start_scan(struct ieee80211_sub_if_data *sdata,
|
|||
|
||||
local->hw_scan_ies_bufsize = local->scan_ies_len + req->ie_len;
|
||||
|
||||
if (local->hw.flags & IEEE80211_SINGLE_HW_SCAN_ON_ALL_BANDS) {
|
||||
if (local->hw.flags & IEEE80211_HW_SINGLE_SCAN_ON_ALL_BANDS) {
|
||||
int i, n_bands = 0;
|
||||
u8 bands_counted = 0;
|
||||
|
||||
|
|
Loading…
Reference in New Issue