Do not allow network block scan_freq override SCAN command frequencies
The manual scan operations with the SCAN command are supposed to have independent set of scan frequencies, so do not allow scan_freq parameters to override scanned frequencies for scans that were triggered with a SCAN command. Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
		
							parent
							
								
									afa2ffb413
								
							
						
					
					
						commit
						0855e2e188
					
				
					 1 changed files with 3 additions and 1 deletions
				
			
		|  | @ -816,7 +816,9 @@ static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx) | ||||||
| 		    wpa_s->last_scan_req == MANUAL_SCAN_REQ) | 		    wpa_s->last_scan_req == MANUAL_SCAN_REQ) | ||||||
| 			wpa_set_scan_ssids(wpa_s, ¶ms, max_ssids); | 			wpa_set_scan_ssids(wpa_s, ¶ms, max_ssids); | ||||||
| 
 | 
 | ||||||
| 		for (tssid = wpa_s->conf->ssid; tssid; tssid = tssid->next) { | 		for (tssid = wpa_s->conf->ssid; | ||||||
|  | 		     wpa_s->last_scan_req != MANUAL_SCAN_REQ && tssid; | ||||||
|  | 		     tssid = tssid->next) { | ||||||
| 			if (wpas_network_disabled(wpa_s, tssid)) | 			if (wpas_network_disabled(wpa_s, tssid)) | ||||||
| 				continue; | 				continue; | ||||||
| 			if ((params.freqs || !freqs_set) && tssid->scan_freq) { | 			if ((params.freqs || !freqs_set) && tssid->scan_freq) { | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue
	
	 Jouni Malinen
						Jouni Malinen