|
Lines 434-446
Link Here
|
| 434 |
ic->ic_flags |= IEEE80211_F_SCAN; |
434 |
ic->ic_flags |= IEEE80211_F_SCAN; |
| 435 |
ieee80211_runtask(ic, &SCAN_PRIVATE(ss)->ss_scan_task); |
435 |
ieee80211_runtask(ic, &SCAN_PRIVATE(ss)->ss_scan_task); |
| 436 |
} |
436 |
} |
| 437 |
return 1; |
|
|
| 438 |
} else { |
437 |
} else { |
| 439 |
IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, |
438 |
IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, |
| 440 |
"%s: %s scan already in progress\n", __func__, |
439 |
"%s: %s scan already in progress\n", __func__, |
| 441 |
ss->ss_flags & IEEE80211_SCAN_ACTIVE ? "active" : "passive"); |
440 |
ss->ss_flags & IEEE80211_SCAN_ACTIVE ? "active" : "passive"); |
| 442 |
} |
441 |
} |
| 443 |
return 0; |
442 |
return !! (ic->ic_flags & IEEE80211_F_SCAN); |
| 444 |
} |
443 |
} |
| 445 |
|
444 |
|
| 446 |
/* |
445 |
/* |
|
Lines 960-965
Link Here
|
| 960 |
IEEE80211_LOCK(ic); |
959 |
IEEE80211_LOCK(ic); |
| 961 |
|
960 |
|
| 962 |
/* |
961 |
/* |
|
|
962 |
* Since a cancellation may have occured during one of the |
| 963 |
* driver calls (whilst unlocked), update scandone. |
| 964 |
*/ |
| 965 |
if (scandone == 0 && |
| 966 |
((SCAN_PRIVATE(ss)->ss_iflags & ISCAN_CANCEL) != 0)) { |
| 967 |
printf("%s: OOPS! scan cancelled during driver call!\n", |
| 968 |
__func__); |
| 969 |
} |
| 970 |
scandone |= ((SCAN_PRIVATE(ss)->ss_iflags & ISCAN_CANCEL) != 0); |
| 971 |
|
| 972 |
/* |
| 963 |
* Record scan complete time. Note that we also do |
973 |
* Record scan complete time. Note that we also do |
| 964 |
* this when canceled so any background scan will |
974 |
* this when canceled so any background scan will |
| 965 |
* not be restarted for a while. |
975 |
* not be restarted for a while. |