diff options
| author |   Markus Theil <markus.theil@tu-ilmenau.de> | 2020-03-12 10:10:54 +0100 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2020-03-20 14:42:19 +0100 |
| commit | 7f3f96cedd79e36b199a8eb4015a077468c37f3a (patch) | |
| tree | d4eee0110076523f3741c679503cdf8a48c3db62 /net/mac80211/rx.c | |
| parent | nl80211: add no pre-auth attribute and ext. feature flag for ctrl. port (diff) | |
| download | linux-dev-7f3f96cedd79e36b199a8eb4015a077468c37f3a.tar.xz linux-dev-7f3f96cedd79e36b199a8eb4015a077468c37f3a.zip | |
mac80211: handle no-preauth flag for control port
This patch adds support for disabling pre-auth rx over the nl80211 control
port for mac80211.
Signed-off-by: Markus Theil <markus.theil@tu-ilmenau.de>
Link: https://lore.kernel.org/r/20200312091055.54257-3-markus.theil@tu-ilmenau.de
[fix indentation slightly, squash feature enablement]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 2ffb4ee467e1..91a13aee4378 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2497,7 +2497,8 @@ static void ieee80211_deliver_skb_to_local_stack(struct sk_buff *skb, struct net_device *dev = sdata->dev; if (unlikely((skb->protocol == sdata->control_port_protocol || - skb->protocol == cpu_to_be16(ETH_P_PREAUTH)) && + (skb->protocol == cpu_to_be16(ETH_P_PREAUTH) && + !sdata->control_port_no_preauth)) && sdata->control_port_over_nl80211)) { struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); bool noencrypt = !(status->flag & RX_FLAG_DECRYPTED); |