From f907e755999b08a4447ea1a73a8ab243e8dbedfb Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 24 Jul 2011 13:09:32 -0700 Subject: [PATCH] --- yaml --- r: 258566 b: refs/heads/master c: 262931339805ce8a7d25c5f75d5b2402013fc55d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 49134b92352d..aa0482f6b038 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 559fafb94ad9e4cd8774f39241917c57396f9fc5 +refs/heads/master: 262931339805ce8a7d25c5f75d5b2402013fc55d diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c index 4b666b7dfe60..b0ae4de7f083 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -2279,6 +2279,7 @@ static void iwlagn_mac_stop(struct ieee80211_hw *hw) IWL_DEBUG_MAC80211(priv, "leave\n"); } +#ifdef CONFIG_PM static int iwlagn_send_patterns(struct iwl_priv *priv, struct cfg80211_wowlan *wowlan) { @@ -2320,6 +2321,7 @@ static int iwlagn_send_patterns(struct iwl_priv *priv, kfree(pattern_cmd); return err; } +#endif static void iwlagn_mac_set_rekey_data(struct ieee80211_hw *hw, struct ieee80211_vif *vif, @@ -2352,6 +2354,7 @@ struct wowlan_key_data { bool error, use_rsc_tsc, use_tkip; }; +#ifdef CONFIG_PM static void iwlagn_convert_p1k(u16 *p1k, __le16 *out) { int i; @@ -2739,6 +2742,7 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw) return 1; } +#endif static void iwlagn_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb) { @@ -3461,8 +3465,10 @@ struct ieee80211_ops iwlagn_hw_ops = { .tx = iwlagn_mac_tx, .start = iwlagn_mac_start, .stop = iwlagn_mac_stop, +#ifdef CONFIG_PM .suspend = iwlagn_mac_suspend, .resume = iwlagn_mac_resume, +#endif .add_interface = iwl_mac_add_interface, .remove_interface = iwl_mac_remove_interface, .change_interface = iwl_mac_change_interface,