| scan.c (fe57d9f5c0a2c1ef97ba8cdc42cfda5743f287b8) | scan.c (55de908ab292c03f1eb280f51170ddb9c6b57e31) |
|---|---|
| 1/* 2 * Scanning implementation 3 * 4 * Copyright 2003, Jouni Malinen <jkmaline@cc.hut.fi> 5 * Copyright 2004, Instant802 Networks, Inc. 6 * Copyright 2005, Devicescape Software, Inc. 7 * Copyright 2006-2007 Jiri Benc <jbenc@suse.cz> 8 * Copyright 2007, Michael Wu <flamingice@sourmilk.net> --- 407 unchanged lines hidden (view full) --- 416 for (i = 0; i < local->scan_req->n_ssids; i++) 417 ieee80211_send_probe_req( 418 sdata, NULL, 419 local->scan_req->ssids[i].ssid, 420 local->scan_req->ssids[i].ssid_len, 421 local->scan_req->ie, local->scan_req->ie_len, 422 local->scan_req->rates[band], false, 423 local->scan_req->no_cck, | 1/* 2 * Scanning implementation 3 * 4 * Copyright 2003, Jouni Malinen <jkmaline@cc.hut.fi> 5 * Copyright 2004, Instant802 Networks, Inc. 6 * Copyright 2005, Devicescape Software, Inc. 7 * Copyright 2006-2007 Jiri Benc <jbenc@suse.cz> 8 * Copyright 2007, Michael Wu <flamingice@sourmilk.net> --- 407 unchanged lines hidden (view full) --- 416 for (i = 0; i < local->scan_req->n_ssids; i++) 417 ieee80211_send_probe_req( 418 sdata, NULL, 419 local->scan_req->ssids[i].ssid, 420 local->scan_req->ssids[i].ssid_len, 421 local->scan_req->ie, local->scan_req->ie_len, 422 local->scan_req->rates[band], false, 423 local->scan_req->no_cck, |
| 424 local->hw.conf.channel); | 424 local->hw.conf.channel, true); |
| 425 426 /* 427 * After sending probe requests, wait for probe responses 428 * on the channel. 429 */ 430 *next_delay = IEEE80211_CHANNEL_TIME; 431 local->next_scan_state = SCAN_DECISION; 432} --- 46 unchanged lines hidden (view full) --- 479 } 480 481 local->scan_req = req; 482 rcu_assign_pointer(local->scan_sdata, sdata); 483 484 if (local->ops->hw_scan) { 485 __set_bit(SCAN_HW_SCANNING, &local->scanning); 486 } else if ((req->n_channels == 1) && | 425 426 /* 427 * After sending probe requests, wait for probe responses 428 * on the channel. 429 */ 430 *next_delay = IEEE80211_CHANNEL_TIME; 431 local->next_scan_state = SCAN_DECISION; 432} --- 46 unchanged lines hidden (view full) --- 479 } 480 481 local->scan_req = req; 482 rcu_assign_pointer(local->scan_sdata, sdata); 483 484 if (local->ops->hw_scan) { 485 __set_bit(SCAN_HW_SCANNING, &local->scanning); 486 } else if ((req->n_channels == 1) && |
| 487 (req->channels[0] == local->oper_channel)) { | 487 (req->channels[0] == local->_oper_channel)) { |
| 488 /* 489 * If we are scanning only on the operating channel 490 * then we do not need to stop normal activities 491 */ 492 unsigned long next_delay; 493 494 __set_bit(SCAN_ONCHANNEL_SCANNING, &local->scanning); 495 --- 534 unchanged lines hidden --- | 488 /* 489 * If we are scanning only on the operating channel 490 * then we do not need to stop normal activities 491 */ 492 unsigned long next_delay; 493 494 __set_bit(SCAN_ONCHANNEL_SCANNING, &local->scanning); 495 --- 534 unchanged lines hidden --- |