From patchwork Mon May 22 19:33:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Otcheretianski X-Patchwork-Id: 1784662 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=DNQVR0s4; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=nNru1AFm; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QQ7426bBwz20PY for ; Tue, 23 May 2023 05:36:34 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=YVa8KBZpP+AvB1a1ZloM36yGqGttQ7MbD+lsKtRquu8=; b=DNQVR0s4i+3HmR V05XLLIzw6Rjmhu64iGqtjNZrRpflHLOLbs+ci7t1Fp+zVlPc9rv/iYCX0ef/tHMNepbMT7ddjHIi wt13L7TWSirrOraOCt/0nBVbwdCy8iYD81j67MzG5Vbw0YoZVNep6etAwxRBAsAWRK5BWpx0dqvWW U+COHlE6uRW33ue1Q9OsvewiGhP5xA9S6+qgPKnoJ/KNoZITOOVjhtHUufLxNoWBEDtSh4fqa2+E5 BjcIFNoreVG/xmgNFfC2puW3V4Hwt/rO9+8feWdoBGsaxvbUajx58S7ZvBE801EYfThbrBCI45tyy 98qL+2f1XbUvWMbb2zPg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q1BK6-007ink-30; Mon, 22 May 2023 19:36:02 +0000 Received: from mga04.intel.com ([192.55.52.120]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q1BJR-007i03-0z for hostap@lists.infradead.org; Mon, 22 May 2023 19:35:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1684784121; x=1716320121; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rKPazbeh7QWEo1FJuCTeNhB/2YNDMBEP+lUZDiOG2Ek=; b=nNru1AFmwJsF6ay5gSkkBfy2CtdXge228OkLrONYE05eHERMAlD8irIl mY6X3uld521ycakew+st/UEcrehVxx/JggRcW06e+eBECwaHB+AA9/9S1 0KiRyuM5jJqMW78Kxmg73sc4vRdtlVKLjFtHgqvnugVsaEKxq4ai2umUG hYcaYnzzdPGTYHBm2TBpHxb2pp4sx4jHkYugdYn4xeI3O9GHc4qM7PiLC BE9gJNQKGiIrG+zgUdxUH3L6bkGRlkGdlLkLq9GG73GW/UJmywU273Mm8 Zi6v+lqdYaqADK3a64l4+DHvctupcGBCrJjD2F+y8QuCw+czpMOwePjOk A==; X-IronPort-AV: E=McAfee;i="6600,9927,10718"; a="351869244" X-IronPort-AV: E=Sophos;i="6.00,184,1681196400"; d="scan'208";a="351869244" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2023 12:35:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10718"; a="827809328" X-IronPort-AV: E=Sophos;i="6.00,184,1681196400"; d="scan'208";a="827809328" Received: from ghorst-mobl3.ger.corp.intel.com (HELO aotchere-desk.intel.com) ([10.254.149.56]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2023 12:35:19 -0700 From: Andrei Otcheretianski To: hostap@lists.infradead.org Cc: Ilan Peer Subject: [PATCH v2 28/44] AP/driver: Add link id to the set_tx_queue_params() callback Date: Mon, 22 May 2023 22:33:56 +0300 Message-Id: <20230522193412.658666-29-andrei.otcheretianski@intel.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230522193412.658666-1-andrei.otcheretianski@intel.com> References: <20230522193412.658666-1-andrei.otcheretianski@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230522_123521_421203_F067AE0B X-CRM114-Status: GOOD ( 13.64 ) X-Spam-Score: -2.7 (--) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: From: Ilan Peer Signed-off-by: Ilan Peer --- src/ap/ap_drv_ops.c | 11 ++++++++++- src/drivers/driver.h | 4 +++- src/drivers/driver_nl80211.c | 7 ++++++- 3 files changed, 19 insertions(+), 3 dele [...] 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 X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Ilan Peer Signed-off-by: Ilan Peer --- src/ap/ap_drv_ops.c | 11 ++++++++++- src/drivers/driver.h | 4 +++- src/drivers/driver_nl80211.c | 7 ++++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c index 014a140efc..cf4ff3ddd8 100644 --- a/src/ap/ap_drv_ops.c +++ b/src/ap/ap_drv_ops.c @@ -657,10 +657,19 @@ int hostapd_set_country(struct hostapd_data *hapd, const char *country) int hostapd_set_tx_queue_params(struct hostapd_data *hapd, int queue, int aifs, int cw_min, int cw_max, int burst_time) { + int link_id = -1; + if (hapd->driver == NULL || hapd->driver->set_tx_queue_params == NULL) return 0; + +#ifdef CONFIG_IEEE80211BE + if (hapd->conf->mld_ap) + link_id = hapd->mld_link_id; +#endif /* CONFIG_IEEE80211BE */ + return hapd->driver->set_tx_queue_params(hapd->drv_priv, queue, aifs, - cw_min, cw_max, burst_time); + cw_min, cw_max, burst_time, + link_id); } diff --git a/src/drivers/driver.h b/src/drivers/driver.h index 41b39e7fc8..97f270fa83 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -3727,9 +3727,11 @@ struct wpa_driver_ops { * @cw_min: cwMin * @cw_max: cwMax * @burst_time: Maximum length for bursting in 0.1 msec units + * @link_id: Link ID to use, or -1 for non MLD. */ int (*set_tx_queue_params)(void *priv, int queue, int aifs, int cw_min, - int cw_max, int burst_time); + int cw_max, int burst_time, + int link_id); /** * if_add - Add a virtual interface diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 1b4abe6158..7bacdd3f50 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -7952,7 +7952,8 @@ static int i802_read_sta_data(struct i802_bss *bss, static int i802_set_tx_queue_params(void *priv, int queue, int aifs, - int cw_min, int cw_max, int burst_time) + int cw_min, int cw_max, int burst_time, + int link_id) { struct i802_bss *bss = priv; struct wpa_driver_nl80211_data *drv = bss->drv; @@ -8004,6 +8005,10 @@ static int i802_set_tx_queue_params(void *priv, int queue, int aifs, nla_nest_end(msg, txq); + if (link_id >= 0 && + nla_put_u8(msg, NL80211_ATTR_MLO_LINK_ID, link_id)) + goto fail; + res = send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL); wpa_printf(MSG_DEBUG, "nl80211: TX queue param set: queue=%d aifs=%d cw_min=%d cw_max=%d burst_time=%d --> res=%d",