From nobody Wed Oct 4 15:23:50 2023 X-Original-To: dev-commits-src-branches@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 4S0z471KLjz4w6M3; Wed, 4 Oct 2023 15:23:51 +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 4S0z4702d8z4NPX; Wed, 4 Oct 2023 15:23:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696433031; 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=TF1FJCpkoBHRbYA45CBhutHZaTixF3zIXxNO4uP8Ia8=; b=jYoa51pAvO435G+pBYuY28U5RcRRHgcJ0dT0CrLkXhWsdZ1QwgiDq7WraM8N8PVS15PN9C bFMl2kAsSLaEzGWWa6L1NYRJLIFArAU0KRVOF36Ia4RgqmD8kYTchRpFYKaHKOwvc6SjeR BunPl1ypP84gXgzpw7HP/GZ9euqnxCMpfStNZTvfTmZYlwMglwQwzg4TbeHx9bdCffa9NC wfSZMMwrW8yCcez6FtzAf34aJwN0E0nTzNx48HZHXiXgK4ULjke8IOrDixCDsi5g+haNJW d3AlstD4qEbJyVfgn+XC0xBLeYlyW0V5JERA8BJDxy1QvwvhjWHA16L2RhiBEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696433031; a=rsa-sha256; cv=none; b=tFotq2T/XnuvhK5ReuwYHyFWEw1qA6bFy8or/V7arrHf6roEKRFMi7O4O9Ps1IALdojf17 SoJ5dSFHGDuS6zxvrQ+hFp+fhJDw9tarmbRN5lCxMKLzuf6mMPZxLzCa2ta+9m/W5QQXax x/Rs+o1xAq3BoIwiy3Ez0CkRV5KSxa0IEzJ4tQXxGnp02ODuLIFZ3/URVknxYi+juorF6C gEI+ULgpydewi9mUTBiTuml0SWJj/Kq4zAao5YCEb+VHEcu76NJzh2PXOdWDpYoeBtYMRt BI0itaPgfTr5WJrVcfZ2ZVQ0FR0Jebp+j0YEERLUWJ8CJiMuREsKROR8qk9BIA== 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=1696433031; 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=TF1FJCpkoBHRbYA45CBhutHZaTixF3zIXxNO4uP8Ia8=; b=nAK8DMS4qNPc6MnY7DPsGXlw+17fNo3kuCjePnwE4H4B0tJmMCyucINDF5O5Pd2v/QoB64 /J293ul79VDe9x5ywdlrDmyM2p8fl7EjT3s/i00Tuw9p0Kfb8aHyuGAg6j/QGgJTMNljsv 5NCFTPNV7TWGj/ek6VRimJVioRBFnDc6XXyrdeCA8E3gu6dpJeHMJ1cTwG0tLgXn3feZ7k /qwQfL27x8bgZys8u++hIUJYxNycAH3yXhK1z0BXUq5ABW7U3g0QOpmHZ8EyrU8qCc8Z5Z R2aL4EFaBHwwj2g7A8H68+G/Fd3LAOBjgr8BCqPE0bucmnV0Zcqcp85XG6CUpA== 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 4S0z466FnxzjSW; Wed, 4 Oct 2023 15:23:50 +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 394FNoJG087234; Wed, 4 Oct 2023 15:23:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 394FNo0R087231; Wed, 4 Oct 2023 15:23:50 GMT (envelope-from git) Date: Wed, 4 Oct 2023 15:23:50 GMT Message-Id: <202310041523.394FNo0R087231@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: 70e2b1f49c18 - stable/14 - LinuxKPI: 802.11: avoid symbol clash on UP to AC mapping List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 70e2b1f49c18c8ff5ca81a49abb0bdaa62708766 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=70e2b1f49c18c8ff5ca81a49abb0bdaa62708766 commit 70e2b1f49c18c8ff5ca81a49abb0bdaa62708766 Author: Bjoern A. Zeeb AuthorDate: 2023-09-24 11:55:11 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-10-04 15:19:19 +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) (cherry picked from commit fb3c249ed93c834d70f8361215bc40a9e9004d3b) --- 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);