diff options
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/ieee80211.h | 6 | ||||
-rw-r--r-- | include/net/ieee80211softmac.h | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index 4087dfc47094..293e920ca59d 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h | |||
@@ -958,11 +958,13 @@ enum ieee80211_state { | |||
958 | 958 | ||
959 | #define IEEE80211_24GHZ_MIN_CHANNEL 1 | 959 | #define IEEE80211_24GHZ_MIN_CHANNEL 1 |
960 | #define IEEE80211_24GHZ_MAX_CHANNEL 14 | 960 | #define IEEE80211_24GHZ_MAX_CHANNEL 14 |
961 | #define IEEE80211_24GHZ_CHANNELS 14 | 961 | #define IEEE80211_24GHZ_CHANNELS (IEEE80211_24GHZ_MAX_CHANNEL - \ |
962 | IEEE80211_24GHZ_MIN_CHANNEL + 1) | ||
962 | 963 | ||
963 | #define IEEE80211_52GHZ_MIN_CHANNEL 34 | 964 | #define IEEE80211_52GHZ_MIN_CHANNEL 34 |
964 | #define IEEE80211_52GHZ_MAX_CHANNEL 165 | 965 | #define IEEE80211_52GHZ_MAX_CHANNEL 165 |
965 | #define IEEE80211_52GHZ_CHANNELS 131 | 966 | #define IEEE80211_52GHZ_CHANNELS (IEEE80211_52GHZ_MAX_CHANNEL - \ |
967 | IEEE80211_52GHZ_MIN_CHANNEL + 1) | ||
966 | 968 | ||
967 | enum { | 969 | enum { |
968 | IEEE80211_CH_PASSIVE_ONLY = (1 << 0), | 970 | IEEE80211_CH_PASSIVE_ONLY = (1 << 0), |
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; |