Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 964dc9e2 authored by Johannes Berg's avatar Johannes Berg
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
parent e05ecccd

drivers/net/wireless/ath/ath6kl/cfg80211.c

+15 −9
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/ath/ath9k/init.c

+11 −9
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/iwlwifi/dvm/dev.h

+3 −0
Original line number Diff line number Diff line
@@ -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 {

drivers/net/wireless/iwlwifi/dvm/mac80211.c

+9 −8
Original line number Diff line number Diff line
@@ -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 |

		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

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+13 −13
Original line number Diff line number Diff line
@@ -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 |

		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 |

			mvm->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.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