diff options
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index cb80a80504e..13d6f890ced 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -748,6 +748,8 @@ struct ieee80211_local { | |||
748 | int user_power_level; /* in dBm */ | 748 | int user_power_level; /* in dBm */ |
749 | int power_constr_level; /* in dBm */ | 749 | int power_constr_level; /* in dBm */ |
750 | 750 | ||
751 | struct work_struct restart_work; | ||
752 | |||
751 | #ifdef CONFIG_MAC80211_DEBUGFS | 753 | #ifdef CONFIG_MAC80211_DEBUGFS |
752 | struct local_debugfsdentries { | 754 | struct local_debugfsdentries { |
753 | struct dentry *rcdir; | 755 | struct dentry *rcdir; |
@@ -1036,15 +1038,22 @@ void ieee80211_handle_pwr_constr(struct ieee80211_sub_if_data *sdata, | |||
1036 | u16 capab_info, u8 *pwr_constr_elem, | 1038 | u16 capab_info, u8 *pwr_constr_elem, |
1037 | u8 pwr_constr_elem_len); | 1039 | u8 pwr_constr_elem_len); |
1038 | 1040 | ||
1039 | /* Suspend/resume */ | 1041 | /* Suspend/resume and hw reconfiguration */ |
1042 | int ieee80211_reconfig(struct ieee80211_local *local); | ||
1043 | |||
1040 | #ifdef CONFIG_PM | 1044 | #ifdef CONFIG_PM |
1041 | int __ieee80211_suspend(struct ieee80211_hw *hw); | 1045 | int __ieee80211_suspend(struct ieee80211_hw *hw); |
1042 | int __ieee80211_resume(struct ieee80211_hw *hw); | 1046 | |
1047 | static inline int __ieee80211_resume(struct ieee80211_hw *hw) | ||
1048 | { | ||
1049 | return ieee80211_reconfig(hw_to_local(hw)); | ||
1050 | } | ||
1043 | #else | 1051 | #else |
1044 | static inline int __ieee80211_suspend(struct ieee80211_hw *hw) | 1052 | static inline int __ieee80211_suspend(struct ieee80211_hw *hw) |
1045 | { | 1053 | { |
1046 | return 0; | 1054 | return 0; |
1047 | } | 1055 | } |
1056 | |||
1048 | static inline int __ieee80211_resume(struct ieee80211_hw *hw) | 1057 | static inline int __ieee80211_resume(struct ieee80211_hw *hw) |
1049 | { | 1058 | { |
1050 | return 0; | 1059 | return 0; |