File tree Expand file tree Collapse file tree 1 file changed +9
-8
lines changed Expand file tree Collapse file tree 1 file changed +9
-8
lines changed Original file line number Diff line number Diff line change @@ -357,7 +357,8 @@ static bool ieee80211_prep_hw_scan(struct ieee80211_sub_if_data *sdata)
357
357
struct cfg80211_scan_request * req ;
358
358
struct cfg80211_chan_def chandef ;
359
359
u8 bands_used = 0 ;
360
- int i , ielen , n_chans ;
360
+ int i , ielen ;
361
+ u32 * n_chans ;
361
362
u32 flags = 0 ;
362
363
363
364
req = rcu_dereference_protected (local -> scan_req ,
@@ -367,34 +368,34 @@ static bool ieee80211_prep_hw_scan(struct ieee80211_sub_if_data *sdata)
367
368
return false;
368
369
369
370
if (ieee80211_hw_check (& local -> hw , SINGLE_SCAN_ON_ALL_BANDS )) {
371
+ local -> hw_scan_req -> req .n_channels = req -> n_channels ;
372
+
370
373
for (i = 0 ; i < req -> n_channels ; i ++ ) {
371
374
local -> hw_scan_req -> req .channels [i ] = req -> channels [i ];
372
375
bands_used |= BIT (req -> channels [i ]-> band );
373
376
}
374
-
375
- n_chans = req -> n_channels ;
376
377
} else {
377
378
do {
378
379
if (local -> hw_scan_band == NUM_NL80211_BANDS )
379
380
return false;
380
381
381
- n_chans = 0 ;
382
+ n_chans = & local -> hw_scan_req -> req .n_channels ;
383
+ * n_chans = 0 ;
382
384
383
385
for (i = 0 ; i < req -> n_channels ; i ++ ) {
384
386
if (req -> channels [i ]-> band !=
385
387
local -> hw_scan_band )
386
388
continue ;
387
- local -> hw_scan_req -> req .channels [n_chans ] =
389
+ local -> hw_scan_req -> req .channels [( * n_chans ) ++ ] =
388
390
req -> channels [i ];
389
- n_chans ++ ;
391
+
390
392
bands_used |= BIT (req -> channels [i ]-> band );
391
393
}
392
394
393
395
local -> hw_scan_band ++ ;
394
- } while (!n_chans );
396
+ } while (!* n_chans );
395
397
}
396
398
397
- local -> hw_scan_req -> req .n_channels = n_chans ;
398
399
ieee80211_prepare_scan_chandef (& chandef , req -> scan_width );
399
400
400
401
if (req -> flags & NL80211_SCAN_FLAG_MIN_PREQ_CONTENT )
You can’t perform that action at this time.
0 commit comments