| Message ID | 20110724.130840.1093555047179460794.davem@davemloft.net (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Sun, Jul 24, 2011 at 01:08:40PM -0700, David Miller wrote: > From: "John W. Linville" <linville@tuxdriver.com> > Date: Sun, 24 Jul 2011 15:19:10 -0400 > > > drivers/net/wireless/iwlwifi/iwl-agn.c:3464: error: unknown field 'suspend' specified in initializer > > drivers/net/wireless/iwlwifi/iwl-agn.c:3464: warning: initialization from incompatible pointer type > > drivers/net/wireless/iwlwifi/iwl-agn.c:3465: error: unknown field 'resume' specified in initializer > > drivers/net/wireless/iwlwifi/iwl-agn.c:3465: warning: initialization from incompatible pointer type > > > > This was caused by commit c8ac61cf ("iwlagn: implement WoWLAN"). > > > > Signed-off-by: John W. Linville <linville@tuxdriver.com> > > Since I already minimally fixed up my build locally last night I know > that your patch leads to a set of warnings because the methods whose > hookup are now commented out become completely unused and they are all > marked "static". And recursively functions that those methods use > become unused too. > > Did you turn off CONFIG_PM and test the build of this file to see > what the compiler actually does with it? > > I'm checking in the following, but I expect much better from you John. Sorry, Dave. I confess that I was hoping for a quick fix on a Sunday afternoon. :-) Thanks for making it better! John
On Sun, 2011-07-24 at 13:39 -0700, John W. Linville wrote: > On Sun, Jul 24, 2011 at 01:08:40PM -0700, David Miller wrote: > > From: "John W. Linville" <linville@tuxdriver.com> > > Date: Sun, 24 Jul 2011 15:19:10 -0400 > > > > > drivers/net/wireless/iwlwifi/iwl-agn.c:3464: error: unknown field 'suspend' specified in initializer > > > drivers/net/wireless/iwlwifi/iwl-agn.c:3464: warning: initialization from incompatible pointer type > > > drivers/net/wireless/iwlwifi/iwl-agn.c:3465: error: unknown field 'resume' specified in initializer > > > drivers/net/wireless/iwlwifi/iwl-agn.c:3465: warning: initialization from incompatible pointer type > > > > > > This was caused by commit c8ac61cf ("iwlagn: implement WoWLAN"). > > > > > > Signed-off-by: John W. Linville <linville@tuxdriver.com> > > > > Since I already minimally fixed up my build locally last night I know > > that your patch leads to a set of warnings because the methods whose > > hookup are now commented out become completely unused and they are all > > marked "static". And recursively functions that those methods use > > become unused too. > > > > Did you turn off CONFIG_PM and test the build of this file to see > > what the compiler actually does with it? > > > > I'm checking in the following, but I expect much better from you John. > > Sorry, Dave. I confess that I was hoping for a quick fix on a Sunday afternoon. :-) > > Thanks for making it better! > > John My mistake to not catch this to begin with, sorry for cause all the trouble. Wey -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 4b666b7..b0ae4de 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) 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,