From nobody Thu Sep 21 17:19:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rs2Fl53wKz4tk7M; Thu, 21 Sep 2023 17:19:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rs2Fl3z1Rz4fWB; Thu, 21 Sep 2023 17:19:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pqg2CJO4th/va77EIW5nCVXKoBS9/gDnMWd4YmCqOO8=; b=GhXcNr7WDogkEwIbRCuNC+Fb652Jwqt1E1aTdvWrs3pu2+V5klfRO4sJ4kPudD1LfGvUOB wXpWwAF+VUXRr0Pyv7d5EIY8xhPzfo2s74sOwaSie5x9sR0Zvxs7Sc4fGMJNL/4stpeoQG PEL7Arpp3haVR7ULswVqyAr2vF7kWdbLn9/a5pctNHfUscIMzyjxYxywFNbnk7Mx49hc7I aXWL3QHalHEoqUQJohwyur+6THrsVNb9akMsC+FWKSMTLNdZCb52lN2piMAkO/K+eIZHtJ RUTzuLUHH71bsbGrdtyD4XeNs8xJ1rpWcZFdX6heKL443vsyCq9ZXIJztBBYMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695316779; a=rsa-sha256; cv=none; b=Xu+chR20VyhEndxuFWbpFImQb+hD7hCOIPpamVZWrlmWZX/C1xMYubDJdnLspdoxXfAWdm /quf3knHqSEacHTk7XUz1+f870RLNTw6wwywF4gJPAEPuebRJaOd++ibRkvF0OSTpjHrEg dnnFY63yCy16p0PEvWxShouu1DkMmrMRCEPJgazLUX6bs4eHkngA7+RhLmgerRFIjqJns4 zlsRxh0khygTNbjAQK9NxnyvQ3TZzAAP7S9wtOXaOmy1s738lO//nOohu5ytev/HaVAlw9 /9ZM3jWsvKYj9V/KFlabTFm+UAscDnsWV9zU9gG9mpQ05B570+7hSTmjYk6Ipg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695316779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pqg2CJO4th/va77EIW5nCVXKoBS9/gDnMWd4YmCqOO8=; b=PUpzCEepPOgjfFzSrXVvdnoxn9X5qrmfDfAyQEVctQeekBkNqfoasmlGss+Tg+erCsK1EA qxHjUlnMtLkgV39SkUM+wfbiXnVhLKNWBcY3zT4HG4u6oFH1otjLblsbXpXrzCD+4uKQur UdUVXk0A4BsCnsf7phsM7iBFOOxEy1NGHaSL2VazqJMVGCJS7xAKuaKL+5huhr473je5vi 280OzE+QagfA4zewIEcZD8xge5bVYboeSQ9Vulwb4iOD1avLbrT2csVeXsl5oVSR/F5EYs 0OKcNwSeuuPQKMzkIqWfKEDlkUa3eNNcenjiSd988DHDzSueHeijFObRAOoJ3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rs2Fl34F9znWL; Thu, 21 Sep 2023 17:19:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LHJdG7076560; Thu, 21 Sep 2023 17:19:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LHJdv3076557; Thu, 21 Sep 2023 17:19:39 GMT (envelope-from git) Date: Thu, 21 Sep 2023 17:19:39 GMT Message-Id: <202309211719.38LHJdv3076557@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: a6042e17c899 - main - LinuxKPI: 802.11: inialize tx queue params List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a6042e17c8999c4965bd4d762c4564b322f1ae7b Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a6042e17c8999c4965bd4d762c4564b322f1ae7b commit a6042e17c8999c4965bd4d762c4564b322f1ae7b Author: Bjoern A. Zeeb AuthorDate: 2023-09-21 12:36:38 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-21 17:08:55 +0000 LinuxKPI: 802.11: inialize tx queue params When adding a VAP (vif) initialize its tx queue parameters calling mo_conf_tx(). I could not spot net80211 providing some of the values needed before having a node so currrently we use hard-coded values with a comment with a reference on how to properly calculate the values in the future (e.g., in case of 11b or other cases). Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/src/linux_80211.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index b97e1c196867..ffad61ba934a 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2244,9 +2244,11 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], struct lkpi_vif *lvif; struct ieee80211vap *vap; struct ieee80211_vif *vif; + struct ieee80211_tx_queue_params txqp; enum ieee80211_bss_changed changed; size_t len; int error, i; + uint16_t ac; if (!TAILQ_EMPTY(&ic->ic_vaps)) /* 1 so far. Add once this works. */ return (NULL); @@ -2345,7 +2347,24 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], changed = 0; lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, changed); - /* conf_tx setup; default WME? */ + /* Configure tx queues (conf_tx), default WME & send BSS_CHANGED_QOS. */ + IMPROVE("Hardcoded values; to fix see 802.11-2016, 9.4.2.29 EDCA Parameter Set element"); + LKPI_80211_LHW_LOCK(lhw); + for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) { + + bzero(&txqp, sizeof(txqp)); + txqp.cw_min = 15; + txqp.cw_max = 1023; + txqp.txop = 0; + txqp.aifs = 2; + error = lkpi_80211_mo_conf_tx(hw, vif, /* link_id */0, ac, &txqp); + if (error != 0) + ic_printf(ic, "%s: conf_tx ac %u failed %d\n", + __func__, ac, error); + } + LKPI_80211_LHW_UNLOCK(lhw); + changed = BSS_CHANGED_QOS; + lkpi_80211_mo_bss_info_changed(hw, vif, &vif->bss_conf, changed); /* Force MC init. */ lkpi_update_mcast_filter(ic, true);