From nobody Wed Nov 29 16:38:34 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 4SgQ4V4q1Wz52x5M; Wed, 29 Nov 2023 16:38:34 +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 4SgQ4V1rcJz3Jqw; Wed, 29 Nov 2023 16:38:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275914; 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=0PuBviWNcWiIZ5aUBR6V46jJeiQ2J/TgOPNuwlLbfzs=; b=r3lrtw+Nf5PFK/PWFnxPs1THMEihfFWqJX/ute0RYOKopBej7z1eu+BNgC0lvPz4YJ6mmq uFVXQ/N21mYsYyRj5TgByWmravGms7Q23m0tK2cDcA5zEQ9AEwYmdwE1f0gbvkZx+PCpQk YntRDI8Y9ysbdasM6fZ+9V0kgb7NSny22TnyWH8NjRE/ghym3b8myaAQ+6i789ErF31ro/ uE8ue8O3l+ee1BDzjr0oaMWYz4pH5awEdWmeTp12nIoIdNhxSyiMYuZ/inGknPLJuCaSsk g7JnoA26Ddk0FgW0Yqauqok0ADj/OkogYfT3nitpvOQvswZ222RSEcxlDAwP+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275914; 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=0PuBviWNcWiIZ5aUBR6V46jJeiQ2J/TgOPNuwlLbfzs=; b=e18kteVEadxGumDFdrXbcLnazFXGCbBUQOA2hFT+AKiw2052MwxZPA4/SsbPJBwcartA3q NiXatGSq5gp3YwHqRxztAToAPjxwbKN0QExo6t4uX06ecn40axmmM37T6CyX7WtVHb1gdu PB9w4E/TPyoQA8Q8mfQVtwul4Fg2l5uR4ABV6axASmnzrsK2odhKwkBAoewaqBQPEj8ycy sQF8gz7A3XiGyOaDyj5gu/GgVEXomga6Kf6xpJ93I2drN+pw3GZT6gzmBTAoaUp6x2f4zV s1TKajRfmn95bggENc9n4pthIo1NJ1LIykxwxtzb+ehZfgvV/sNr7M3NEM9FrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275914; a=rsa-sha256; cv=none; b=M5W2mJNNBKEGS0SzTOu+8CxerX+BYDLnY+0Zc7eSalZfqacOCIoH+/amsSMDj0jV+gacTi B/SbUqpxxCt6befOSVw/j1az2fEM/g8XJ3QXQXwhqp4xVGeWQaVr5mPqpHwluEF7babi8J Pr9NYhMzWBG48gJ0yNojc1Pf/egDdVAZ1S0gMO1QRdMoxvJYn2hf3DVk3oyWSY51JI2Il1 zrXh0SrIQ8avr83UxwrnEHqzn3h5t3SCdiMikoaQPYJnl2Evc0MvZDHnSttNMlVzXyyBTw kzyvNwW6sitSgqDZ93qmGJNnLZBW3DEQ74gyqEdjfMcDjRqjAuzHeqgC7cHW8A== 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 4SgQ4V0xR3z1C49; Wed, 29 Nov 2023 16:38:34 +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 3ATGcYh2046179; Wed, 29 Nov 2023 16:38:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcYhb046176; Wed, 29 Nov 2023 16:38:34 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:34 GMT Message-Id: <202311291638.3ATGcYhb046176@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: cf245c69978e - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: cf245c69978ed8a9aa43340d7c3285166730889d Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=cf245c69978ed8a9aa43340d7c3285166730889d commit cf245c69978ed8a9aa43340d7c3285166730889d Author: Bjoern A. Zeeb AuthorDate: 2023-09-24 11:55:11 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:09 +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 98ffcbfbef74..4a641c296ed2 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -113,7 +113,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, @@ -239,7 +240,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; @@ -3283,7 +3284,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);