diff options
author | David S. Miller <davem@davemloft.net> | 2011-07-24 16:09:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-07-24 16:09:32 -0400 |
commit | 262931339805ce8a7d25c5f75d5b2402013fc55d (patch) | |
tree | e1ac78e93bf9c4e336f5d22011125d4258a8d8cf /drivers/net/wireless | |
parent | 559fafb94ad9e4cd8774f39241917c57396f9fc5 (diff) |
iwlwifi: Fix build with CONFIG_PM disabled.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 4b666b7dfe60..b0ae4de7f083 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -2279,6 +2279,7 @@ static void iwlagn_mac_stop(struct ieee80211_hw *hw) | |||
2279 | IWL_DEBUG_MAC80211(priv, "leave\n"); | 2279 | IWL_DEBUG_MAC80211(priv, "leave\n"); |
2280 | } | 2280 | } |
2281 | 2281 | ||
2282 | #ifdef CONFIG_PM | ||
2282 | static int iwlagn_send_patterns(struct iwl_priv *priv, | 2283 | static int iwlagn_send_patterns(struct iwl_priv *priv, |
2283 | struct cfg80211_wowlan *wowlan) | 2284 | struct cfg80211_wowlan *wowlan) |
2284 | { | 2285 | { |
@@ -2320,6 +2321,7 @@ static int iwlagn_send_patterns(struct iwl_priv *priv, | |||
2320 | kfree(pattern_cmd); | 2321 | kfree(pattern_cmd); |
2321 | return err; | 2322 | return err; |
2322 | } | 2323 | } |
2324 | #endif | ||
2323 | 2325 | ||
2324 | static void iwlagn_mac_set_rekey_data(struct ieee80211_hw *hw, | 2326 | static void iwlagn_mac_set_rekey_data(struct ieee80211_hw *hw, |
2325 | struct ieee80211_vif *vif, | 2327 | struct ieee80211_vif *vif, |
@@ -2352,6 +2354,7 @@ struct wowlan_key_data { | |||
2352 | bool error, use_rsc_tsc, use_tkip; | 2354 | bool error, use_rsc_tsc, use_tkip; |
2353 | }; | 2355 | }; |
2354 | 2356 | ||
2357 | #ifdef CONFIG_PM | ||
2355 | static void iwlagn_convert_p1k(u16 *p1k, __le16 *out) | 2358 | static void iwlagn_convert_p1k(u16 *p1k, __le16 *out) |
2356 | { | 2359 | { |
2357 | int i; | 2360 | int i; |
@@ -2739,6 +2742,7 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw) | |||
2739 | 2742 | ||
2740 | return 1; | 2743 | return 1; |
2741 | } | 2744 | } |
2745 | #endif | ||
2742 | 2746 | ||
2743 | static void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | 2747 | static void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb) |
2744 | { | 2748 | { |
@@ -3461,8 +3465,10 @@ struct ieee80211_ops iwlagn_hw_ops = { | |||
3461 | .tx = iwlagn_mac_tx, | 3465 | .tx = iwlagn_mac_tx, |
3462 | .start = iwlagn_mac_start, | 3466 | .start = iwlagn_mac_start, |
3463 | .stop = iwlagn_mac_stop, | 3467 | .stop = iwlagn_mac_stop, |
3468 | #ifdef CONFIG_PM | ||
3464 | .suspend = iwlagn_mac_suspend, | 3469 | .suspend = iwlagn_mac_suspend, |
3465 | .resume = iwlagn_mac_resume, | 3470 | .resume = iwlagn_mac_resume, |
3471 | #endif | ||
3466 | .add_interface = iwl_mac_add_interface, | 3472 | .add_interface = iwl_mac_add_interface, |
3467 | .remove_interface = iwl_mac_remove_interface, | 3473 | .remove_interface = iwl_mac_remove_interface, |
3468 | .change_interface = iwl_mac_change_interface, | 3474 | .change_interface = iwl_mac_change_interface, |