cfg80211: take WoWLAN support information out of wiphy struct

There's no need to take up the space for devices that don't
support WoWLAN, and most drivers can even make the support
data static const (except where it's modified at runtime.)

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

8 files changed, 74 insertions, 52 deletions

diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index 5c9736a94e54..f7995b2b12a4 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -3679,6 +3679,20 @@ err:
         return NULL;
 }
 
+#ifdef CONFIG_PM
+static const struct wiphy_wowlan_support ath6kl_wowlan_support = {
+        .flags = WIPHY_WOWLAN_MAGIC_PKT |
+                 WIPHY_WOWLAN_DISCONNECT |
+                 WIPHY_WOWLAN_GTK_REKEY_FAILURE  |
+                 WIPHY_WOWLAN_SUPPORTS_GTK_REKEY |
+                 WIPHY_WOWLAN_EAP_IDENTITY_REQ   |
+                 WIPHY_WOWLAN_4WAY_HANDSHAKE,
+        .n_patterns = WOW_MAX_FILTERS_PER_LIST,
+        .pattern_min_len = 1,
+        .pattern_max_len = WOW_PATTERN_SIZE,
+};
+#endif
+
 int ath6kl_cfg80211_init(struct ath6kl *ar)
 {
         struct wiphy *wiphy = ar->wiphy;
@@ -3772,15 +3786,7 @@ int ath6kl_cfg80211_init(struct ath6kl *ar)
         wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);
 
 #ifdef CONFIG_PM
-        wiphy->wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT |
-                              WIPHY_WOWLAN_DISCONNECT |
-                              WIPHY_WOWLAN_GTK_REKEY_FAILURE  |
-                              WIPHY_WOWLAN_SUPPORTS_GTK_REKEY |
-                              WIPHY_WOWLAN_EAP_IDENTITY_REQ   |
-                              WIPHY_WOWLAN_4WAY_HANDSHAKE;
-        wiphy->wowlan.n_patterns = WOW_MAX_FILTERS_PER_LIST;
-        wiphy->wowlan.pattern_min_len = 1;
-        wiphy->wowlan.pattern_max_len = WOW_PATTERN_SIZE;
+        wiphy->wowlan = &ath6kl_wowlan_support;
 #endif
 
         wiphy->max_sched_scan_ssids = MAX_PROBED_SSIDS;
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index 0237b2868961..f993362e9e13 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -755,6 +755,15 @@ static const struct ieee80211_iface_combination if_comb[] = {
         }
 };
 
+#ifdef CONFIG_PM
+static const struct wiphy_wowlan_support ath9k_wowlan_support = {
+        .flags = WIPHY_WOWLAN_MAGIC_PKT | WIPHY_WOWLAN_DISCONNECT,
+        .n_patterns = MAX_NUM_USER_PATTERN,
+        .pattern_min_len = 1,
+        .pattern_max_len = MAX_PATTERN_SIZE,
+};
+#endif
+
 void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
 {
         struct ath_hw *ah = sc->sc_ah;
@@ -797,15 +806,8 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
 #ifdef CONFIG_PM_SLEEP
 
         if ((ah->caps.hw_caps & ATH9K_HW_WOW_DEVICE_CAPABLE) &&
-            device_can_wakeup(sc->dev)) {
-
-                hw->wiphy->wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT |
-                                          WIPHY_WOWLAN_DISCONNECT;
-                hw->wiphy->wowlan.n_patterns = MAX_NUM_USER_PATTERN;
-                hw->wiphy->wowlan.pattern_min_len = 1;
-                hw->wiphy->wowlan.pattern_max_len = MAX_PATTERN_SIZE;
-
-        }
+            device_can_wakeup(sc->dev))
+                hw->wiphy->wowlan = &ath9k_wowlan_support;
 
         atomic_set(&sc->wow_sleep_proc_intr, -1);
         atomic_set(&sc->wow_got_bmiss_intr, -1);
diff --git a/drivers/net/wireless/iwlwifi/dvm/dev.h b/drivers/net/wireless/iwlwifi/dvm/dev.h
index 71ea77576d22..e71acfd344aa 100644
--- a/drivers/net/wireless/iwlwifi/dvm/dev.h
+++ b/drivers/net/wireless/iwlwifi/dvm/dev.h
@@ -870,6 +870,9 @@ struct iwl_priv {
         __le64 replay_ctr;
         __le16 last_seq_ctl;
         bool have_rekey_data;
+#ifdef CONFIG_PM_SLEEP
+        struct wiphy_wowlan_support wowlan_support;
+#endif
 
         /* device_pointers: pointers to ucode event tables */
         struct {
diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
index cab23af0be9e..661b5e71aac8 100644
--- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
@@ -208,20 +208,21 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
             priv->trans->ops->d3_suspend &&
             priv->trans->ops->d3_resume &&
             device_can_wakeup(priv->trans->dev)) {
-                hw->wiphy->wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT |
-                                          WIPHY_WOWLAN_DISCONNECT |
-                                          WIPHY_WOWLAN_EAP_IDENTITY_REQ |
-                                          WIPHY_WOWLAN_RFKILL_RELEASE;
+                priv->wowlan_support.flags = WIPHY_WOWLAN_MAGIC_PKT |
+                                             WIPHY_WOWLAN_DISCONNECT |
+                                             WIPHY_WOWLAN_EAP_IDENTITY_REQ |
+                                             WIPHY_WOWLAN_RFKILL_RELEASE;
                 if (!iwlwifi_mod_params.sw_crypto)
-                        hw->wiphy->wowlan.flags |=
+                        priv->wowlan_support.flags |=
                                 WIPHY_WOWLAN_SUPPORTS_GTK_REKEY |
                                 WIPHY_WOWLAN_GTK_REKEY_FAILURE;
 
-                hw->wiphy->wowlan.n_patterns = IWLAGN_WOWLAN_MAX_PATTERNS;
-                hw->wiphy->wowlan.pattern_min_len =
+                priv->wowlan_support.n_patterns = IWLAGN_WOWLAN_MAX_PATTERNS;
+                priv->wowlan_support.pattern_min_len =
                                         IWLAGN_WOWLAN_MIN_PATTERN_LEN;
-                hw->wiphy->wowlan.pattern_max_len =
+                priv->wowlan_support.pattern_max_len =
                                         IWLAGN_WOWLAN_MAX_PATTERN_LEN;
+                hw->wiphy->wowlan = &priv->wowlan_support;
         }
 #endif
 
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index dd158ec571fb..827fa641490f 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -222,20 +222,20 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
             mvm->trans->ops->d3_suspend &&
             mvm->trans->ops->d3_resume &&
             device_can_wakeup(mvm->trans->dev)) {
-                hw->wiphy->wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT |
-                                          WIPHY_WOWLAN_DISCONNECT |
-                                          WIPHY_WOWLAN_EAP_IDENTITY_REQ |
-                                          WIPHY_WOWLAN_RFKILL_RELEASE;
+                mvm->wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT |
+                                    WIPHY_WOWLAN_DISCONNECT |
+                                    WIPHY_WOWLAN_EAP_IDENTITY_REQ |
+                                    WIPHY_WOWLAN_RFKILL_RELEASE;
                 if (!iwlwifi_mod_params.sw_crypto)
-                        hw->wiphy->wowlan.flags |=
-                                WIPHY_WOWLAN_SUPPORTS_GTK_REKEY |
-                                WIPHY_WOWLAN_GTK_REKEY_FAILURE |
-                                WIPHY_WOWLAN_4WAY_HANDSHAKE;
-
-                hw->wiphy->wowlan.n_patterns = IWL_WOWLAN_MAX_PATTERNS;
-                hw->wiphy->wowlan.pattern_min_len = IWL_WOWLAN_MIN_PATTERN_LEN;
-                hw->wiphy->wowlan.pattern_max_len = IWL_WOWLAN_MAX_PATTERN_LEN;
-                hw->wiphy->wowlan.tcp = &iwl_mvm_wowlan_tcp_support;
+                        mvm->wowlan.flags |= WIPHY_WOWLAN_SUPPORTS_GTK_REKEY |
+                                             WIPHY_WOWLAN_GTK_REKEY_FAILURE |
+                                             WIPHY_WOWLAN_4WAY_HANDSHAKE;
+
+                mvm->wowlan.n_patterns = IWL_WOWLAN_MAX_PATTERNS;
+                mvm->wowlan.pattern_min_len = IWL_WOWLAN_MIN_PATTERN_LEN;
+                mvm->wowlan.pattern_max_len = IWL_WOWLAN_MAX_PATTERN_LEN;
+                mvm->wowlan.tcp = &iwl_mvm_wowlan_tcp_support;
+                hw->wiphy->wowlan = &mvm->wowlan;
         }
 #endif
 
diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h
index 8269bc562951..b62a948658ac 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h
@@ -336,6 +336,7 @@ struct iwl_mvm {
         struct ieee80211_vif *p2p_device_vif;
 
 #ifdef CONFIG_PM_SLEEP
+        struct wiphy_wowlan_support wowlan;
         int gtk_ivlen, gtk_icvlen, ptk_ivlen, ptk_icvlen;
 #endif
 
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index e42b266a023a..60077895adff 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -2426,6 +2426,16 @@ static struct cfg80211_ops mwifiex_cfg80211_ops = {
 #endif
 };
 
+#ifdef CONFIG_PM
+static const struct wiphy_wowlan_support mwifiex_wowlan_support = {
+        .flags = WIPHY_WOWLAN_MAGIC_PKT,
+        .n_patterns = MWIFIEX_MAX_FILTERS,
+        .pattern_min_len = 1,
+        .pattern_max_len = MWIFIEX_MAX_PATTERN_LEN,
+        .max_pkt_offset = MWIFIEX_MAX_OFFSET_LEN,
+};
+#endif
+
 /*
  * This function registers the device with CFG802.11 subsystem.
  *
@@ -2483,11 +2493,7 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
         wiphy_apply_custom_regulatory(wiphy, &mwifiex_world_regdom_custom);
 
 #ifdef CONFIG_PM
-        wiphy->wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT;
-        wiphy->wowlan.n_patterns = MWIFIEX_MAX_FILTERS;
-        wiphy->wowlan.pattern_min_len = 1;
-        wiphy->wowlan.pattern_max_len = MWIFIEX_MAX_PATTERN_LEN;
-        wiphy->wowlan.max_pkt_offset = MWIFIEX_MAX_OFFSET_LEN;
+        wiphy->wowlan = &mwifiex_wowlan_support;
 #endif
 
         wiphy->probe_resp_offload = NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS |
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index 953111a502ee..796928ba875f 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -6018,6 +6018,15 @@ int wlcore_free_hw(struct wl1271 *wl)
 }
 EXPORT_SYMBOL_GPL(wlcore_free_hw);
 
+#ifdef CONFIG_PM
+static const struct wiphy_wowlan_support wlcore_wowlan_support = {
+        .flags = WIPHY_WOWLAN_ANY,
+        .n_patterns = WL1271_MAX_RX_FILTERS,
+        .pattern_min_len = 1,
+        .pattern_max_len = WL1271_RX_FILTER_MAX_PATTERN_SIZE,
+};
+#endif
+
 static void wlcore_nvs_cb(const struct firmware *fw, void *context)
 {
         struct wl1271 *wl = context;
@@ -6071,14 +6080,8 @@ static void wlcore_nvs_cb(const struct firmware *fw, void *context)
         if (!ret) {
                 wl->irq_wake_enabled = true;
                 device_init_wakeup(wl->dev, 1);
-                if (pdata->pwr_in_suspend) {
-                        wl->hw->wiphy->wowlan.flags = WIPHY_WOWLAN_ANY;
-                        wl->hw->wiphy->wowlan.n_patterns =
-                                WL1271_MAX_RX_FILTERS;
-                        wl->hw->wiphy->wowlan.pattern_min_len = 1;
-                        wl->hw->wiphy->wowlan.pattern_max_len =
-                                WL1271_RX_FILTER_MAX_PATTERN_SIZE;
-                }
+                if (pdata->pwr_in_suspend)
+                        wl->hw->wiphy->wowlan = &wlcore_wowlan_support;
         }
 #endif
         disable_irq(wl->irq);