summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2006-05-05 16:56:24 -0400
committerJohn W. Linville <linville@tuxdriver.com>2006-05-05 16:56:24 -0400
commitfd5226a72694d1c0abe1cc39711a86f1754e637d (patch)
tree1d90b27c392fb2ef9859f2652dee7640916ed806 /include/net
parentaad61439e6a00bdb72cb649e11f6e166590c5f66 (diff)
parent178e0cc5ff249965c6cfbd78b1af6a5e614d837c (diff)
downloadop-kernel-dev-fd5226a72694d1c0abe1cc39711a86f1754e637d.zip
op-kernel-dev-fd5226a72694d1c0abe1cc39711a86f1754e637d.tar.gz
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'include/net')
-rw-r--r--include/net/ieee80211.h6
-rw-r--r--include/net/ieee80211softmac.h3
2 files changed, 6 insertions, 3 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index 4087dfc..293e920 100644
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -958,11 +958,13 @@ enum ieee80211_state {
#define IEEE80211_24GHZ_MIN_CHANNEL 1
#define IEEE80211_24GHZ_MAX_CHANNEL 14
-#define IEEE80211_24GHZ_CHANNELS 14
+#define IEEE80211_24GHZ_CHANNELS (IEEE80211_24GHZ_MAX_CHANNEL - \
+ IEEE80211_24GHZ_MIN_CHANNEL + 1)
#define IEEE80211_52GHZ_MIN_CHANNEL 34
#define IEEE80211_52GHZ_MAX_CHANNEL 165
-#define IEEE80211_52GHZ_CHANNELS 131
+#define IEEE80211_52GHZ_CHANNELS (IEEE80211_52GHZ_MAX_CHANNEL - \
+ IEEE80211_52GHZ_MIN_CHANNEL + 1)
enum {
IEEE80211_CH_PASSIVE_ONLY = (1 << 0),
diff --git a/include/net/ieee80211softmac.h b/include/net/ieee80211softmac.h
index b1ebfba..052ed59 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;
OpenPOWER on IntegriCloud