diff options
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 5c38ea08454..1f9336a30e3 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -29,9 +29,6 @@ | |||
29 | #include "key.h" | 29 | #include "key.h" |
30 | #include "sta_info.h" | 30 | #include "sta_info.h" |
31 | 31 | ||
32 | /* ieee80211.o internal definitions, etc. These are not included into | ||
33 | * low-level drivers. */ | ||
34 | |||
35 | struct ieee80211_local; | 32 | struct ieee80211_local; |
36 | 33 | ||
37 | /* Maximum number of broadcast/multicast frames to buffer when some of the | 34 | /* Maximum number of broadcast/multicast frames to buffer when some of the |
@@ -293,13 +290,13 @@ struct mesh_config { | |||
293 | #define IEEE80211_STA_AUTO_BSSID_SEL BIT(11) | 290 | #define IEEE80211_STA_AUTO_BSSID_SEL BIT(11) |
294 | #define IEEE80211_STA_AUTO_CHANNEL_SEL BIT(12) | 291 | #define IEEE80211_STA_AUTO_CHANNEL_SEL BIT(12) |
295 | #define IEEE80211_STA_PRIVACY_INVOKED BIT(13) | 292 | #define IEEE80211_STA_PRIVACY_INVOKED BIT(13) |
296 | /* flags for MLME request*/ | 293 | /* flags for MLME request */ |
297 | #define IEEE80211_STA_REQ_SCAN 0 | 294 | #define IEEE80211_STA_REQ_SCAN 0 |
298 | #define IEEE80211_STA_REQ_DIRECT_PROBE 1 | 295 | #define IEEE80211_STA_REQ_DIRECT_PROBE 1 |
299 | #define IEEE80211_STA_REQ_AUTH 2 | 296 | #define IEEE80211_STA_REQ_AUTH 2 |
300 | #define IEEE80211_STA_REQ_RUN 3 | 297 | #define IEEE80211_STA_REQ_RUN 3 |
301 | 298 | ||
302 | /* flags used for setting mlme state */ | 299 | /* STA/IBSS MLME states */ |
303 | enum ieee80211_sta_mlme_state { | 300 | enum ieee80211_sta_mlme_state { |
304 | IEEE80211_STA_MLME_DISABLED, | 301 | IEEE80211_STA_MLME_DISABLED, |
305 | IEEE80211_STA_MLME_DIRECT_PROBE, | 302 | IEEE80211_STA_MLME_DIRECT_PROBE, |