提交 e6b3b2ed 编写于 作者: A Amitkumar Karwar 提交者: Kalle Valo

rsi: fix kbuild reported build errors with CONFIG_PM off

Some wowlan related code was outside CONFIG_PM flag which caused these
build errors. They are fixed by moving that code under CONFIG_PM flag.
Reported-by: Nkbuild test robot <fengguang.wu@intel.com>
Fixes: ef71ed0608c ("rsi: sdio: Add WOWLAN support for S5 shutdown state")
Fixes: a24e35fcee0 ("rsi: sdio: Add WOWLAN support for S4 hibernate state")
Fixes: e1ced6422a3 ("rsi: sdio: add WOWLAN support for S3 suspend state")
Signed-off-by: NAmitkumar Karwar <amit.karwar@redpinesignals.com>
Signed-off-by: NKalle Valo <kvalo@codeaurora.org>
上级 39f1332c
...@@ -1752,6 +1752,7 @@ static int rsi_mac80211_cancel_roc(struct ieee80211_hw *hw) ...@@ -1752,6 +1752,7 @@ static int rsi_mac80211_cancel_roc(struct ieee80211_hw *hw)
return 0; return 0;
} }
#ifdef CONFIG_PM
static const struct wiphy_wowlan_support rsi_wowlan_support = { static const struct wiphy_wowlan_support rsi_wowlan_support = {
.flags = WIPHY_WOWLAN_ANY | .flags = WIPHY_WOWLAN_ANY |
WIPHY_WOWLAN_MAGIC_PKT | WIPHY_WOWLAN_MAGIC_PKT |
...@@ -1824,7 +1825,6 @@ int rsi_config_wowlan(struct rsi_hw *adapter, struct cfg80211_wowlan *wowlan) ...@@ -1824,7 +1825,6 @@ int rsi_config_wowlan(struct rsi_hw *adapter, struct cfg80211_wowlan *wowlan)
} }
EXPORT_SYMBOL(rsi_config_wowlan); EXPORT_SYMBOL(rsi_config_wowlan);
#ifdef CONFIG_PM
static int rsi_mac80211_suspend(struct ieee80211_hw *hw, static int rsi_mac80211_suspend(struct ieee80211_hw *hw,
struct cfg80211_wowlan *wowlan) struct cfg80211_wowlan *wowlan)
{ {
...@@ -1977,7 +1977,10 @@ int rsi_mac80211_attach(struct rsi_common *common) ...@@ -1977,7 +1977,10 @@ int rsi_mac80211_attach(struct rsi_common *common)
wiphy->features |= NL80211_FEATURE_INACTIVITY_TIMER; wiphy->features |= NL80211_FEATURE_INACTIVITY_TIMER;
wiphy->reg_notifier = rsi_reg_notify; wiphy->reg_notifier = rsi_reg_notify;
#ifdef CONFIG_PM
wiphy->wowlan = &rsi_wowlan_support; wiphy->wowlan = &rsi_wowlan_support;
#endif
wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST); wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);
/* Wi-Fi direct parameters */ /* Wi-Fi direct parameters */
......
...@@ -1597,6 +1597,7 @@ static int rsi_send_beacon(struct rsi_common *common) ...@@ -1597,6 +1597,7 @@ static int rsi_send_beacon(struct rsi_common *common)
return 0; return 0;
} }
#ifdef CONFIG_PM
int rsi_send_wowlan_request(struct rsi_common *common, u16 flags, int rsi_send_wowlan_request(struct rsi_common *common, u16 flags,
u16 sleep_status) u16 sleep_status)
{ {
...@@ -1630,6 +1631,7 @@ int rsi_send_wowlan_request(struct rsi_common *common, u16 flags, ...@@ -1630,6 +1631,7 @@ int rsi_send_wowlan_request(struct rsi_common *common, u16 flags,
return rsi_send_internal_mgmt_frame(common, skb); return rsi_send_internal_mgmt_frame(common, skb);
} }
#endif
/** /**
* rsi_handle_ta_confirm_type() - This function handles the confirm frames. * rsi_handle_ta_confirm_type() - This function handles the confirm frames.
......
...@@ -83,7 +83,9 @@ u16 rsi_get_connected_channel(struct ieee80211_vif *vif); ...@@ -83,7 +83,9 @@ u16 rsi_get_connected_channel(struct ieee80211_vif *vif);
struct rsi_hw *rsi_91x_init(void); struct rsi_hw *rsi_91x_init(void);
void rsi_91x_deinit(struct rsi_hw *adapter); void rsi_91x_deinit(struct rsi_hw *adapter);
int rsi_read_pkt(struct rsi_common *common, s32 rcv_pkt_len); int rsi_read_pkt(struct rsi_common *common, s32 rcv_pkt_len);
#ifdef CONFIG_PM
int rsi_config_wowlan(struct rsi_hw *adapter, struct cfg80211_wowlan *wowlan); int rsi_config_wowlan(struct rsi_hw *adapter, struct cfg80211_wowlan *wowlan);
#endif
struct rsi_sta *rsi_find_sta(struct rsi_common *common, u8 *mac_addr); struct rsi_sta *rsi_find_sta(struct rsi_common *common, u8 *mac_addr);
struct ieee80211_vif *rsi_get_vif(struct rsi_hw *adapter, u8 *mac); struct ieee80211_vif *rsi_get_vif(struct rsi_hw *adapter, u8 *mac);
void rsi_roc_timeout(struct timer_list *t); void rsi_roc_timeout(struct timer_list *t);
......
...@@ -668,8 +668,10 @@ int rsi_band_check(struct rsi_common *common, struct ieee80211_channel *chan); ...@@ -668,8 +668,10 @@ int rsi_band_check(struct rsi_common *common, struct ieee80211_channel *chan);
int rsi_send_rx_filter_frame(struct rsi_common *common, u16 rx_filter_word); int rsi_send_rx_filter_frame(struct rsi_common *common, u16 rx_filter_word);
int rsi_send_radio_params_update(struct rsi_common *common); int rsi_send_radio_params_update(struct rsi_common *common);
int rsi_set_antenna(struct rsi_common *common, u8 antenna); int rsi_set_antenna(struct rsi_common *common, u8 antenna);
#ifdef CONFIG_PM
int rsi_send_wowlan_request(struct rsi_common *common, u16 flags, int rsi_send_wowlan_request(struct rsi_common *common, u16 flags,
u16 sleep_status); u16 sleep_status);
#endif
int rsi_send_ps_request(struct rsi_hw *adapter, bool enable, int rsi_send_ps_request(struct rsi_hw *adapter, bool enable,
struct ieee80211_vif *vif); struct ieee80211_vif *vif);
#endif #endif
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册