summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2026-08-02 17:33:39 +0200
committerJohannes Berg <johannes.berg@intel.com>2026-08-02 17:39:01 +0200
commit0ca7040f20998089d7004660ec819d4fef822fdf (patch)
treeef07a9d20231cd05bdbf0ca92417952801b2cfb1
parent4a0bd262df757b25fc4e2a53c947317c119ced4e (diff)
downloadlinux-next-0ca7040f20998089d7004660ec819d4fef822fdf.tar.gz
linux-next-0ca7040f20998089d7004660ec819d4fef822fdf.zip
Revert "wifi: mac80211: don't encrypt pre-auth (ETH_P_PREAUTH) frames"
This reverts commit dd406779999fa2065ec6b7c4f80906b727041d2c. Never encrypting the frames broke a number of tests that do additional pre-authentication while already connected, and then the frames didn't go out correctly. Whatever this was intended to fix, this wasn't the right fix. Fixes: dd406779999f ("wifi: mac80211: don't encrypt pre-auth (ETH_P_PREAUTH) frames") Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--net/mac80211/tx.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 0cf5f6ec75e6..14311aab7d18 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -557,9 +557,6 @@ ieee80211_tx_h_check_control_port_protocol(struct ieee80211_tx_data *tx)
info->flags |= IEEE80211_TX_CTL_USE_MINRATE;
}
- if (tx->skb->protocol == htons(ETH_P_PREAUTH))
- info->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
-
return TX_CONTINUE;
}