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)
357357 struct cfg80211_scan_request * req ;
358358 struct cfg80211_chan_def chandef ;
359359 u8 bands_used = 0 ;
360- int i , ielen , n_chans ;
360+ int i , ielen ;
361+ u32 * n_chans ;
361362 u32 flags = 0 ;
362363
363364 req = rcu_dereference_protected (local -> scan_req ,
@@ -367,34 +368,34 @@ static bool ieee80211_prep_hw_scan(struct ieee80211_sub_if_data *sdata)
367368 return false;
368369
369370 if (ieee80211_hw_check (& local -> hw , SINGLE_SCAN_ON_ALL_BANDS )) {
371+ local -> hw_scan_req -> req .n_channels = req -> n_channels ;
372+
370373 for (i = 0 ; i < req -> n_channels ; i ++ ) {
371374 local -> hw_scan_req -> req .channels [i ] = req -> channels [i ];
372375 bands_used |= BIT (req -> channels [i ]-> band );
373376 }
374-
375- n_chans = req -> n_channels ;
376377 } else {
377378 do {
378379 if (local -> hw_scan_band == NUM_NL80211_BANDS )
379380 return false;
380381
381- n_chans = 0 ;
382+ n_chans = & local -> hw_scan_req -> req .n_channels ;
383+ * n_chans = 0 ;
382384
383385 for (i = 0 ; i < req -> n_channels ; i ++ ) {
384386 if (req -> channels [i ]-> band !=
385387 local -> hw_scan_band )
386388 continue ;
387- local -> hw_scan_req -> req .channels [n_chans ] =
389+ local -> hw_scan_req -> req .channels [( * n_chans ) ++ ] =
388390 req -> channels [i ];
389- n_chans ++ ;
391+
390392 bands_used |= BIT (req -> channels [i ]-> band );
391393 }
392394
393395 local -> hw_scan_band ++ ;
394- } while (!n_chans );
396+ } while (!* n_chans );
395397 }
396398
397- local -> hw_scan_req -> req .n_channels = n_chans ;
398399 ieee80211_prepare_scan_chandef (& chandef , req -> scan_width );
399400
400401 if (req -> flags & NL80211_SCAN_FLAG_MIN_PREQ_CONTENT )
You can’t perform that action at this time.
0 commit comments