ieee80211_sta.c (3b00b9a6) | ieee80211_sta.c (2808a02b) |
---|---|
1/*- 2 * Copyright (c) 2007-2008 Sam Leffler, Errno Consulting 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 1470 unchanged lines hidden (view full) --- 1479 * scan and if no data frames have come through 1480 * recently, kick off a scan. Note that this 1481 * is the mechanism by which a background scan 1482 * is started _and_ continued each time we 1483 * return on-channel to receive a beacon from 1484 * our ap. 1485 */ 1486 if (ic->ic_flags & IEEE80211_F_SCAN) { | 1/*- 2 * Copyright (c) 2007-2008 Sam Leffler, Errno Consulting 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 1470 unchanged lines hidden (view full) --- 1479 * scan and if no data frames have come through 1480 * recently, kick off a scan. Note that this 1481 * is the mechanism by which a background scan 1482 * is started _and_ continued each time we 1483 * return on-channel to receive a beacon from 1484 * our ap. 1485 */ 1486 if (ic->ic_flags & IEEE80211_F_SCAN) { |
1487 ieee80211_add_scan(vap, &scan, wh, 1488 subtype, rssi, nf); | 1487 ieee80211_add_scan(vap, ic->ic_curchan, 1488 &scan, wh, subtype, rssi, nf); |
1489 } else if (contbgscan(vap)) { 1490 ieee80211_bg_scan(vap, 0); 1491 } else if (startbgscan(vap)) { 1492 vap->iv_stats.is_scan_bg++; 1493#if 0 1494 /* wakeup if we are sleeing */ 1495 ieee80211_set_pwrsave(vap, 0); 1496#endif --- 27 unchanged lines hidden (view full) --- 1524 * is 802.11 traffic present. 1525 * 1526 * XXX check if the beacon we recv'd gives 1527 * us what we need and suppress the probe req 1528 */ 1529 ieee80211_probe_curchan(vap, 1); 1530 ic->ic_flags_ext &= ~IEEE80211_FEXT_PROBECHAN; 1531 } | 1489 } else if (contbgscan(vap)) { 1490 ieee80211_bg_scan(vap, 0); 1491 } else if (startbgscan(vap)) { 1492 vap->iv_stats.is_scan_bg++; 1493#if 0 1494 /* wakeup if we are sleeing */ 1495 ieee80211_set_pwrsave(vap, 0); 1496#endif --- 27 unchanged lines hidden (view full) --- 1524 * is 802.11 traffic present. 1525 * 1526 * XXX check if the beacon we recv'd gives 1527 * us what we need and suppress the probe req 1528 */ 1529 ieee80211_probe_curchan(vap, 1); 1530 ic->ic_flags_ext &= ~IEEE80211_FEXT_PROBECHAN; 1531 } |
1532 ieee80211_add_scan(vap, &scan, wh, subtype, rssi, nf); | 1532 ieee80211_add_scan(vap, ic->ic_curchan, &scan, wh, 1533 subtype, rssi, nf); |
1533 return; 1534 } 1535 break; 1536 } 1537 1538 case IEEE80211_FC0_SUBTYPE_AUTH: { 1539 uint16_t algo, seq, status; 1540 /* --- 324 unchanged lines hidden --- | 1534 return; 1535 } 1536 break; 1537 } 1538 1539 case IEEE80211_FC0_SUBTYPE_AUTH: { 1540 uint16_t algo, seq, status; 1541 /* --- 324 unchanged lines hidden --- |