diff options
Diffstat (limited to 'net/mac80211/sta_info.h')
-rw-r--r-- | net/mac80211/sta_info.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index d6b566076f05..c6ae8718bd57 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h | |||
@@ -318,7 +318,7 @@ struct sta_info { | |||
318 | u8 plink_retries; | 318 | u8 plink_retries; |
319 | bool ignore_plink_timer; | 319 | bool ignore_plink_timer; |
320 | bool plink_timer_was_running; | 320 | bool plink_timer_was_running; |
321 | enum plink_state plink_state; | 321 | enum nl80211_plink_state plink_state; |
322 | u32 plink_timeout; | 322 | u32 plink_timeout; |
323 | struct timer_list plink_timer; | 323 | struct timer_list plink_timer; |
324 | #endif | 324 | #endif |
@@ -336,12 +336,12 @@ struct sta_info { | |||
336 | struct ieee80211_sta sta; | 336 | struct ieee80211_sta sta; |
337 | }; | 337 | }; |
338 | 338 | ||
339 | static inline enum plink_state sta_plink_state(struct sta_info *sta) | 339 | static inline enum nl80211_plink_state sta_plink_state(struct sta_info *sta) |
340 | { | 340 | { |
341 | #ifdef CONFIG_MAC80211_MESH | 341 | #ifdef CONFIG_MAC80211_MESH |
342 | return sta->plink_state; | 342 | return sta->plink_state; |
343 | #endif | 343 | #endif |
344 | return PLINK_LISTEN; | 344 | return NL80211_PLINK_LISTEN; |
345 | } | 345 | } |
346 | 346 | ||
347 | static inline void set_sta_flags(struct sta_info *sta, const u32 flags) | 347 | static inline void set_sta_flags(struct sta_info *sta, const u32 flags) |