--- a/net80211/ieee80211_proto.c +++ b/net80211/ieee80211_proto.c @@ -1415,7 +1415,8 @@ __ieee80211_newstate(struct ieee80211vap vap->iv_state = nstate; /* state transition */ del_timer(&vap->iv_mgtsend); if ((vap->iv_opmode != IEEE80211_M_HOSTAP) && - (ostate != IEEE80211_S_SCAN)) + (ostate != IEEE80211_S_SCAN) && + !(vap->iv_flags_ext & IEEE80211_FEXT_SCAN_PENDING)) ieee80211_cancel_scan(vap); /* background scan */ ni = vap->iv_bss; /* NB: no reference held */ switch (nstate) { @@ -1457,7 +1458,8 @@ __ieee80211_newstate(struct ieee80211vap } goto reset; case IEEE80211_S_SCAN: - ieee80211_cancel_scan(vap); + if (!(vap->iv_flags_ext & IEEE80211_FEXT_SCAN_PENDING)) + ieee80211_cancel_scan(vap); goto reset; reset: ieee80211_reset_bss(vap); @@ -1995,7 +1997,9 @@ ieee80211_newstate(struct ieee80211vap * } } } - } else if (dstate == IEEE80211_S_SCAN) { + } else if ((dstate == IEEE80211_S_SCAN) || + (dstate == IEEE80211_S_AUTH) || + (dstate == IEEE80211_S_ASSOC)) { /* Force to scan pending... someone is scanning */ vap->iv_flags_ext |= IEEE80211_FEXT_SCAN_PENDING; __ieee80211_newstate(vap, IEEE80211_S_INIT, arg); --- a/net80211/ieee80211_output.c +++ b/net80211/ieee80211_output.c @@ -238,7 +238,9 @@ ieee80211_hardstart(struct sk_buff *skb, } /* Cancel any running BG scan */ - if (!(ic->ic_flags_ext & IEEE80211_FEXT_BGSCAN_THR) && (vap->iv_state == IEEE80211_S_RUN)) + if (!(ic->ic_flags_ext & IEEE80211_FEXT_BGSCAN_THR) && + (vap->iv_state == IEEE80211_S_RUN) && + (ic->ic_flags_ext & IEEE80211_FEXT_BGSCAN)) ieee80211_cancel_scan(vap); /* --- a/net80211/ieee80211_wireless.c +++ b/net80211/ieee80211_wireless.c @@ -2728,9 +2728,9 @@ ieee80211_ioctl_setparam(struct net_devi return -EINVAL; vap->iv_flags |= IEEE80211_F_BGSCAN; } else { - /* XXX racey? */ + if (ic->ic_flags_ext & IEEE80211_FEXT_BGSCAN) + ieee80211_cancel_scan(vap); /* anything current */ vap->iv_flags &= ~IEEE80211_F_BGSCAN; - ieee80211_cancel_scan(vap); /* anything current */ } break; case IEEE80211_PARAM_BGSCAN_IDLE: ream&id=23cdbf2644dcbb3538b5e3341122a83603afeb3f'>commitdiffstats
path: root/include/scan.mk
blob: e6b21b27b009ce14f8683980add8d2be3bea9340 (plain) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110