diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2024-01-31 21:07:17 +0100 |
|---|---|---|
| committer | iwlwifi publisher <> | 2024-04-17 12:42:02 +0000 |
| commit | 4d632af0ecc603c4a6b087cf6610b9d09ae61f68 (patch) | |
| tree | 7c03391e8d7ee06413207c0ff557adec6e8e74cc | |
| parent | da93948705478c22778ac632c039dfd362c47d7e (diff) | |
| download | backport-iwlwifi-4d632af0ecc603c4a6b087cf6610b9d09ae61f68.tar.gz | |
Revert "[BUGFIX] [NOUPSTREAM] mac80211: remove check for local->wolan in gtk_rekey_add()"
This reverts commit a485fea3007f. With the pseudo-D3 rekeying
tests removed, we no longer need it.
type=cleanup
ticket=none
Change-Id: I460bac3a99abc04e63759747bd2912be04f3072b
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/92318
tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com>
Tested-by: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
x-iwlwifi-stack-dev: 2224b710ed201da5b3a9bc38c67e728e3c6cfc43
| -rw-r--r-- | net/mac80211/key.c | 9 | ||||
| -rw-r--r-- | versions | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/net/mac80211/key.c b/net/mac80211/key.c index da4bd0c94d..a2cce62c97 100644 --- a/net/mac80211/key.c +++ b/net/mac80211/key.c @@ -1375,15 +1375,12 @@ ieee80211_gtk_rekey_add(struct ieee80211_vif *vif, struct ieee80211_key_conf *keyconf) { struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif); + struct ieee80211_local *local = sdata->local; struct ieee80211_key *key; int err; - /* - * TODO: we should check for local->wowlan here, because - * calling gtk_rekey_add() without being in wowlan can cause - * problems, unless we refactor the code to unify - * gtk_rekey_add() with gtk_rekey_notify(). - */ + if (WARN_ON(!local->wowlan)) + return ERR_PTR(-EINVAL); if (WARN_ON(vif->type != NL80211_IFTYPE_STATION)) return ERR_PTR(-EINVAL); @@ -2,4 +2,4 @@ BACKPORTS_VERSION="(see git)" BACKPORTED_KERNEL_VERSION="(see git)" BACKPORTED_KERNEL_NAME="iwlwifi" BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__ -BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11863:0c2b779e" +BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11864:2224b710" |