diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-05-05 16:56:24 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-05-05 16:56:24 -0400 |
| commit | fd5226a72694d1c0abe1cc39711a86f1754e637d (patch) | |
| tree | 1d90b27c392fb2ef9859f2652dee7640916ed806 /include/net/ieee80211softmac.h | |
| parent | aad61439e6a00bdb72cb649e11f6e166590c5f66 (diff) | |
| parent | 178e0cc5ff249965c6cfbd78b1af6a5e614d837c (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'include/net/ieee80211softmac.h')
| -rw-r--r-- | include/net/ieee80211softmac.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/ieee80211softmac.h b/include/net/ieee80211softmac.h index b1ebfbae397f..052ed596a4e4 100644 --- a/include/net/ieee80211softmac.h +++ b/include/net/ieee80211softmac.h | |||
| @@ -204,7 +204,8 @@ struct ieee80211softmac_device { | |||
| 204 | 204 | ||
| 205 | /* couple of flags */ | 205 | /* couple of flags */ |
| 206 | u8 scanning:1, /* protects scanning from being done multiple times at once */ | 206 | u8 scanning:1, /* protects scanning from being done multiple times at once */ |
| 207 | associated:1; | 207 | associated:1, |
| 208 | running:1; | ||
| 208 | 209 | ||
| 209 | struct ieee80211softmac_scaninfo *scaninfo; | 210 | struct ieee80211softmac_scaninfo *scaninfo; |
| 210 | struct ieee80211softmac_assoc_info associnfo; | 211 | struct ieee80211softmac_assoc_info associnfo; |