[v2,38/44] AP: Specify the link ID for set_key() callback

Message ID	20230522193412.658666-39-andrei.otcheretianski@intel.com
State	Accepted
Headers	show Return-Path: <hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> From: Andrei Otcheretianski <andrei.otcheretianski@intel.com> To: hostap@lists.infradead.org Cc: Ilan Peer <ilan.peer@intel.com>, Andrei Otcheretianski <andrei.otcheretianski@intel.com> Subject: [PATCH v2 38/44] AP: Specify the link ID for set_key() callback Date: Mon, 22 May 2023 22:34:06 +0300 Message-Id: <20230522193412.658666-39-andrei.otcheretianski@intel.com> In-Reply-To: <20230522193412.658666-1-andrei.otcheretianski@intel.com> References: <20230522193412.658666-1-andrei.otcheretianski@intel.com> MIME-Version: 1.0 preview: From: Ilan Peer <ilan.peer@intel.com> If the AP is part of a MLD AP specify the link ID in the set key parameters. Signed-off-by: Ilan Peer <ilan.peer@intel.com> Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com> --- src/ap/ap_drv_ops.c \| 5 +++++ src/ap/wpa_auth.c \| 24 ++++++ [...] Content analysis details: (-2.7 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [192.55.52.120 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 SPF_NONE SPF: sender does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.2 DKIMWL_WL_HIGH DKIMwl.org - High trust sender Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Hostap" <hostap-bounces@lists.infradead.org> Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org
Series	Add basic MLO support for AP \| expand [v2,00/44] Add basic MLO support for AP [v2,01/44] driver_nl80211: Rename the per iface-type capabilities struct [v2,02/44] nl80211: Add support to fetch EML/MLD capabilities [v2,03/44] AP: MLO: Retrieve EML and MLD capabilities from driver [v2,04/44] AP: Add some basic MLD configuration options [v2,05/44] driver: Add MLD link id to AP parameters [v2,06/44] driver: Allow to provide a link ID when setting a channel [v2,07/44] driver_nl80211: Support setting up an AP on a specified link [v2,08/44] AP: Allow starting multiple interfaces within single MLD [v2,09/44] AP: Include an RNR element in beacons for MLD AP [v2,10/44] driver_nl80211: Select freq according to transmitting link [v2,11/44] AP: MLO: Make 802.1X SM, authserv and radius client singletons [v2,12/44] AP: Match Rx frames against MLD address [v2,13/44] AP: Support building basic Multi-Link Element [v2,14/44] AP: MLO: Handle ML element during authentication [v2,15/44] AP: MLO: Add MLO information to hostapd_sta_add_params struct [v2,16/44] AP: Support AID allocation for MLD [v2,17/44] AP: MLO: Process EHT ML element from association request [v2,18/44] AP: MLO: Add ML element to association response [v2,19/44] AP: MLO: Handle association callback [v2,20/44] AP: MLO: Handle deauth/disassoc of MLD station [v2,21/44] AP: MLO: Handle 802.1X port authorization [v2,22/44] driver: Specify link ID for 'send_mlme' and 'sta_deauth' callbacks [v2,23/44] AP: Do not prune station when adding a link station [v2,24/44] AP: Handle TX status for MLD AP [v2,25/44] AP: Print MLD info in STATUS command [v2,26/44] AP/wpa_supplicant/driver: Add link id to send eapol callbacks [v2,27/44] AP: Provide the link ID for an MLD setting when setting VLAN [v2,28/44] AP/driver: Add link id to the set_tx_queue_params() callback [v2,29/44] driver_nl80211: use frequency to determine mld link for MLME events [v2,30/44] AP: Forward link specific events [v2,31/44] WPA_AUTH: MLO: Store MLO link information [v2,32/44] WPA_AUTH: MLO: Add MAC KDE to 1st message in 4-way handshake [v2,33/44] WPA_AUTH: MLO: Validate MLO KDEs in 2nd message of 4-way handshake [v2,34/44] WPA_AUTH: MLO: Add MLO KDEs to message 3 of the 4-way handshake [v2,35/44] WPA_AUTH: MLO: Validate MLO KDEs in 4th message of 4-way handshake [v2,36/44] WPA_AUTH: MLO: Add MLO KDEs to message 1 of the group handshake [v2,37/44] WPA_AUTH: MLO: Get the correct AA and SPA based on MLD operation [v2,38/44] AP: Specify the link ID for set_key() callback [v2,39/44] AP: Use MLD address for SAE commit derivation [v2,40/44] AP: Don't process SAE/OWE assoc info on MLD links [v2,41/44] AP: Use MLD address for traffic tests [v2,42/44] AP: Forward EAPOL frames and status to correct BSS [v2,43/44] driver_nl80211: Store and report link id for MLO control frames [v2,44/44] tests: Add basic MLD hwsim tests

Message ID

20230522193412.658666-39-andrei.otcheretianski@intel.com

State

Accepted

Headers

From: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
To: hostap@lists.infradead.org
Cc: Ilan Peer <ilan.peer@intel.com>,
	Andrei Otcheretianski <andrei.otcheretianski@intel.com>
Subject: [PATCH v2 38/44] AP: Specify the link ID for set_key() callback
Date: Mon, 22 May 2023 22:34:06 +0300
Message-Id: <20230522193412.658666-39-andrei.otcheretianski@intel.com>
In-Reply-To: <20230522193412.658666-1-andrei.otcheretianski@intel.com>
References: <20230522193412.658666-1-andrei.otcheretianski@intel.com>
MIME-Version: 1.0
Precedence: list
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: "Hostap" <hostap-bounces@lists.infradead.org>
Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org

Series

Add basic MLO support for AP | expand

Commit Message

Andrei Otcheretianski May 22, 2023, 7:34 p.m. UTC

From: Ilan Peer <ilan.peer@intel.com>

If the AP is part of a MLD AP specify the link ID in the
set key parameters.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
---
 src/ap/ap_drv_ops.c |  5 +++++
 src/ap/wpa_auth.c   | 24 ++++++------------------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c
index cf4ff3ddd8..399ca7abc6 100644
--- a/src/ap/ap_drv_ops.c
+++ b/src/ap/ap_drv_ops.c
@@ -758,6 +758,11 @@  int hostapd_drv_set_key(const char *ifname, struct hostapd_data *hapd,
 	params.key_flag = key_flag;
 	params.link_id = -1;
 
+#ifdef CONFIG_IEEE80211BE
+	if (hapd->conf->mld_ap && !(key_flag & KEY_FLAG_PAIRWISE))
+		params.link_id = hapd->mld_link_id;
+#endif /* CONFIG_IEEE80211BE */
+
 	return hapd->driver->set_key(hapd->drv_priv, &params);
 }
 
diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c
index 2ad5cf8a72..0003be1e4c 100644
--- a/src/ap/wpa_auth.c
+++ b/src/ap/wpa_auth.c
@@ -36,20 +36,6 @@ 
 #include "sta_info.h"
 
 
-static const u8 *wpa_auth_get_aa(struct wpa_state_machine *sm)
-{
-	return (sm && sm->mld_assoc_link_id >= 0) ?
-		sm->own_mld_addr : sm->wpa_auth->addr;
-}
-
-
-static const u8 *wpa_auth_get_spa(struct wpa_state_machine *sm)
-{
-	return sm->mld_assoc_link_id >= 0 ?
-		sm->peer_mld_addr : sm->addr;
-}
-
-
 #define STATE_MACHINE_DATA struct wpa_state_machine
 #define STATE_MACHINE_DEBUG_PREFIX "WPA"
 #define STATE_MACHINE_ADDR wpa_auth_get_spa(sm)
@@ -98,15 +84,17 @@  static const int dot11RSNAConfigPMKReauthThreshold = 70;
 static const int dot11RSNAConfigSATimeout = 60;
 
 
-static const u8 * wpa_auth_get_aa(const struct wpa_state_machine *sm)
+static const u8 * wpa_auth_get_aa(struct wpa_state_machine *sm)
 {
-	return sm->wpa_auth->addr;
+	return (sm && sm->mld_assoc_link_id >= 0) ?
+		sm->own_mld_addr : sm->wpa_auth->addr;
 }
 
 
-static const u8 * wpa_auth_get_spa(const struct wpa_state_machine *sm)
+static const u8 * wpa_auth_get_spa(struct wpa_state_machine *sm)
 {
-	return sm->addr;
+	return sm->mld_assoc_link_id >= 0 ?
+		sm->peer_mld_addr : sm->addr;
 }

[v2,38/44] AP: Specify the link ID for set_key() callback

Commit Message

Patch