From nobody Mon Oct 9 23:16:12 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 4S4FJr4q14z4wgrW; Mon, 9 Oct 2023 23:16:12 +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 4S4FJr4JvLz3Q47; Mon, 9 Oct 2023 23:16:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696893372; 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=+ZI/MSzXFFaGUic9UOtNy0S6Vi2Cgo+PIsgv7qjWUIg=; b=nrodRxC2ySctazJ6OIERwfOOfIXjbS0bqpNeCx90D9FLb+s5y9H+bYOVazju5f7parwogF ZEFqu19stP4RRtKg+bKsYKkYhKRT/1stPJSMb0kZuvk3ByAFKo0usgUMlG0Rh9JjgfAm94 6V70yLcbfwYtfRZJBB8Dfm76hzVUtXRAUbGiC7f6QLUhT7YsQoOo7NcMcL/6DHo8d+ee5A KkSPeBZ1GxdkvS9LS/F1s8vxneGBz/mx0BEAQZrL6SOU/mFDAgyjCV0J9aZ9xNrmU/ne75 iiFq9kIal+w0NpVA4blUpNfgl9QeE3oxIDctpkprNQqLuS6t1vApvCjL3Zsu0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696893372; a=rsa-sha256; cv=none; b=H0A/9/Hb3PfXPNPynR2dqi0Je+SrzwrwkVqplqtuc4a63GE+vvKerS3J+PkmYwEIE8k1BQ jhMmRWkWnOeBJHBpt2DgXlCdQFiuKnkx3uFOHB+aVOUUrsLc7Oi/T281ttF9q6M0PRB37L cfpmsV147w5dGKuFE9vc26AdsM4WQUEv4LS6SDuXPbl2hIfIBhvV443Y1OdGbjGE11MCGP 0HkpsP2nIj4Nrb0/d8mjgmeHrQq361i9UJi2IGD75Vumo1tgLI6i/4Ina7llEDvoAXoqG8 rBF9Qm7na+xDHWvdbg/aXoEksPcCxXDB8BsedWwuDPa8aaxGmrOTeaDFBHxX0w== 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=1696893372; 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=+ZI/MSzXFFaGUic9UOtNy0S6Vi2Cgo+PIsgv7qjWUIg=; b=Gjn5i4doRVdwHAVSvaQdbzAq637BRhF5DP1stFe5TXbmr910mneZ303TH3tHeIool4O730 PRoBEUEDABT+1mdHLgo4xyDkDM+Fsm4l0/fZYL0/9vbKz9pi9uqcxAvjr8Xn7YWKhjv/85 WaYBoJC1rA24ixzim360fJPIFZ54n9ZfiYJ/RpSQALFcWoGTP1Z5Xb8QUJho7Biaf0x+WB UqZ7QUZ1RXJALMDY/oFABha6EAzFFr8TYz/d9IJdYz1MgwV3yPB1sKmZ62TqfUb2+7ZUG4 w3+9FTtRFS17pIoGv6zYLwVacISDMb9yQXT7TqxOAVQQNhQrkWeGWHOODd9/Pg== 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 4S4FJr3M7Czh5; Mon, 9 Oct 2023 23:16:12 +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 399NGCJ4071146; Mon, 9 Oct 2023 23:16:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 399NGCZd071143; Mon, 9 Oct 2023 23:16:12 GMT (envelope-from git) Date: Mon, 9 Oct 2023 23:16:12 GMT Message-Id: <202310092316.399NGCZd071143@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: f4f49fcba3c4 - releng/14.0 - LinuxKPI: 802.11: avoid symbol clash on UP to AC mapping 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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: f4f49fcba3c4258f30f1dc806e8610cbd43197cb Auto-Submitted: auto-generated The branch releng/14.0 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f4f49fcba3c4258f30f1dc806e8610cbd43197cb commit f4f49fcba3c4258f30f1dc806e8610cbd43197cb Author: Bjoern A. Zeeb AuthorDate: 2023-09-24 11:55:11 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-10-09 23:14:52 +0000 LinuxKPI: 802.11: avoid symbol clash on UP to AC mapping tid_to_mac80211_ac is an exported symbol in and likely based on iwlwifi, which leads to a symbol clash in NetBSD. Rename our local LinuxKPI copy to a better name and add a comment where to find a copy of the mapping table. Sponsored by: The FreeBSD Foundation Reported by: Phil Nelson (phil netbsd org) Approved by: re (gjb) (cherry picked from commit fb3c249ed93c834d70f8361215bc40a9e9004d3b) (cherry picked from commit 70e2b1f49c18c8ff5ca81a49abb0bdaa62708766) --- sys/compat/linuxkpi/common/src/linux_80211.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 5e7a3ff91b9f..c8232e6f33cc 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -116,7 +116,8 @@ const uint8_t rfc1042_header[6] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 }; /* IEEE 802.11-05/0257r1 */ const uint8_t bridge_tunnel_header[6] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 }; -const uint8_t tid_to_mac80211_ac[] = { +/* IEEE 802.11e Table 20i-UP-to-AC mappings. */ +static const uint8_t ieee80211e_up_to_ac[] = { IEEE80211_AC_BE, IEEE80211_AC_BK, IEEE80211_AC_BK, @@ -242,7 +243,7 @@ lkpi_lsta_alloc(struct ieee80211vap *vap, const uint8_t mac[IEEE80211_ADDR_LEN], IMPROVE("AP/if we support non-STA here too"); ltxq->txq.ac = IEEE80211_AC_VO; } else { - ltxq->txq.ac = tid_to_mac80211_ac[tid & 7]; + ltxq->txq.ac = ieee80211e_up_to_ac[tid & 7]; } ltxq->seen_dequeue = false; ltxq->stopped = false; @@ -3243,7 +3244,7 @@ lkpi_80211_txq_tx_one(struct lkpi_sta *lsta, struct mbuf *m) ac = IEEE80211_AC_BE; } else { skb->priority = tid & IEEE80211_QOS_CTL_TID_MASK; - ac = tid_to_mac80211_ac[tid & 7]; + ac = ieee80211e_up_to_ac[tid & 7]; } skb_set_queue_mapping(skb, ac);