diff options
author | Stephen Hemminger <shemminger@osdl.org> | 2006-05-08 16:01:20 -0700 |
---|---|---|
committer | Stephen Hemminger <shemminger@osdl.org> | 2006-05-08 16:01:20 -0700 |
commit | 23aee82e75c1ced9492cbff6090b8e213d95945e (patch) | |
tree | 2d8f0f7fc59a65bffc852c7dc167ee6b196c07a7 /include/net/ieee80211softmac.h | |
parent | 8ec93459655a3618dedec6360bb28d63f0010ef6 (diff) | |
parent | 178e0cc5ff249965c6cfbd78b1af6a5e614d837c (diff) |
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
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 b1ebfbae397..052ed596a4e 100644 --- a/include/net/ieee80211softmac.h +++ b/include/net/ieee80211softmac.h @@ -204,7 +204,8 @@ struct ieee80211softmac_device { /* couple of flags */ u8 scanning:1, /* protects scanning from being done multiple times at once */ - associated:1; + associated:1, + running:1; struct ieee80211softmac_scaninfo *scaninfo; struct ieee80211softmac_assoc_info associnfo; |