diff options
Diffstat (limited to 'include')
| -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 4725ff861c57..d5926bfb1fc9 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h | |||
| @@ -955,11 +955,13 @@ enum ieee80211_state { | |||
| 955 | 955 | ||
| 956 | #define IEEE80211_24GHZ_MIN_CHANNEL 1 | 956 | #define IEEE80211_24GHZ_MIN_CHANNEL 1 |
| 957 | #define IEEE80211_24GHZ_MAX_CHANNEL 14 | 957 | #define IEEE80211_24GHZ_MAX_CHANNEL 14 |
| 958 | #define IEEE80211_24GHZ_CHANNELS 14 | 958 | #define IEEE80211_24GHZ_CHANNELS (IEEE80211_24GHZ_MAX_CHANNEL - \ |
| 959 | IEEE80211_24GHZ_MIN_CHANNEL + 1) | ||
| 959 | 960 | ||
| 960 | #define IEEE80211_52GHZ_MIN_CHANNEL 34 | 961 | #define IEEE80211_52GHZ_MIN_CHANNEL 34 |
| 961 | #define IEEE80211_52GHZ_MAX_CHANNEL 165 | 962 | #define IEEE80211_52GHZ_MAX_CHANNEL 165 |
| 962 | #define IEEE80211_52GHZ_CHANNELS 131 | 963 | #define IEEE80211_52GHZ_CHANNELS (IEEE80211_52GHZ_MAX_CHANNEL - \ |
| 964 | IEEE80211_52GHZ_MIN_CHANNEL + 1) | ||
| 963 | 965 | ||
| 964 | enum { | 966 | enum { |
| 965 | IEEE80211_CH_PASSIVE_ONLY = (1 << 0), | 967 | 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; |
