2024-05-10 09:33:57

by Johannes Berg

Subject: [PATCH] wifi: mac80211: RX auth frames on P2P device

From: Andrei Otcheretianski <[email protected]>

This is needed for PASN based P2P pairing.

Signed-off-by: Andrei Otcheretianski <[email protected]>
Reviewed-by: Miriam Rachel Korenblit <[email protected]>
Signed-off-by: Johannes Berg <[email protected]>
---
net/mac80211/main.c | 9 +++++++--
net/mac80211/rx.c | 4 +++-
2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 4eaea0a9975b..aa6c349175b8 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -5,7 +5,7 @@
* Copyright 2006-2007 Jiri Benc <[email protected]>
* Copyright 2013-2014 Intel Mobile Communications GmbH
* Copyright (C) 2017 Intel Deutschland GmbH
- * Copyright (C) 2018-2023 Intel Corporation
+ * Copyright (C) 2018-2024 Intel Corporation
*/

#include <net/mac80211.h>
@@ -716,8 +716,13 @@ ieee80211_default_mgmt_stypes[NUM_NL80211_IFTYPES] = {
},
[NL80211_IFTYPE_P2P_DEVICE] = {
.tx = 0xffff,
+ /*
+ * To support P2P PASN pairing let user space register to rx
+ * also AUTH frames on P2P device interface.
+ */
.rx = BIT(IEEE80211_STYPE_ACTION >> 4) |
- BIT(IEEE80211_STYPE_PROBE_REQ >> 4),
+ BIT(IEEE80211_STYPE_PROBE_REQ >> 4) |
+ BIT(IEEE80211_STYPE_AUTH >> 4),
},
};

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 4914692750e5..13485f0f702c 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -4552,7 +4552,9 @@ static bool ieee80211_accept_frame(struct ieee80211_rx_data *rx)
return ieee80211_is_public_action(hdr, skb->len) ||
ieee80211_is_probe_req(hdr->frame_control) ||
ieee80211_is_probe_resp(hdr->frame_control) ||
- ieee80211_is_beacon(hdr->frame_control);
+ ieee80211_is_beacon(hdr->frame_control) ||
+ (ieee80211_is_auth(hdr->frame_control) &&
+ ether_addr_equal(sdata->vif.addr, hdr->addr1));
case NL80211_IFTYPE_NAN:
/* Currently no frames on NAN interface are allowed */
return false;
--
2.45.0

2024-05-14 10:43:17

by Kalle Valo

Subject: Re: [PATCH] wifi: mac80211: RX auth frames on P2P device

Johannes Berg <[email protected]> writes:

> From: Andrei Otcheretianski <[email protected]>
>
> This is needed for PASN based P2P pairing.
>
> Signed-off-by: Andrei Otcheretianski <[email protected]>
> Reviewed-by: Miriam Rachel Korenblit <[email protected]>
> Signed-off-by: Johannes Berg <[email protected]>

The commit message is not really telling much, is the title missing a
verb or something?

--
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches