From nobody Mon Sep 25 17:45:09 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 4RvVdK6NZdz4tr64; Mon, 25 Sep 2023 17:45:09 +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 4RvVdK5y0hz3Bxq; Mon, 25 Sep 2023 17:45:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695663909; 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=k29o8F+q1TgOEf1EO04FZrajSsRDibdn1CwdjrZHNW8=; b=SxpayiOMDTAEu+KtNqlwFPOqJJbi82/HMIplHSghVnc/iNIx+cL09zcMf8QcX6ZYkhe0cD n9qzZ51+u+qJUrtd73aOYOpTnOIVtiX0jcHFdMaFIDVtRmvb1Ugaapset/8JtEV8E2/Fis Rv+Z1nimzZZgoUiJA+9IU9JOGcWr9MGq5JBcOiCWq/emM56NOrr4YFrpSpummUHFWHA/7R F6Z9kZLMnyvo76+dlEHBoiicRgPaKSF/OGqFnmOddrFvpw3TvTUIsjs4Hm9VBFozhw+AzC iGS4wjktAaMciQyE7CTGcbTXNQ5VYxWaPxrQjQ5r2FLqvBl81lq27qqZeO5HuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695663909; a=rsa-sha256; cv=none; b=cqrdv1jbiFq4P0zgYbznHt8GavyF9kwCItRB93iYHmyzAJ8FYsOfHhPzU0Vzajy0sGPrUy DOdZIiXFrfa0EPYcQT6mTkAPV1qOeWqbW3QoUyFKBFXQyKgHmPODy/nhvqrdtOv/x2K79n Po2IFmz1KxHZ0fW1+EZoAMV6EYEDBjLUIb62ZEV0TKtRnOi55AVr7pranNK7dunEIzOBi7 YFvjQdBkv06r0lsH6t9tOMq5s03gHSz+4KvdzTOAz2p4SC7qmAyW7eDSKkkDikovqosF8j L9t0rO5oi5I79A4TgXzjBthl/T6T7yRAOFiNVRKEQqVCaWIrv1r6mIBHaAamhw== 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=1695663909; 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=k29o8F+q1TgOEf1EO04FZrajSsRDibdn1CwdjrZHNW8=; b=F61lxjycFDunczRjrgFVAu46Zbhfgsh2ZGvE4ubOEBd2KGfvAkaCEUvI6NVSVwFxLrU0JI oJTqdszaIIiFFj0Z/XOwx8Aq3CnIisv4yOMdeshh62yqFWtizeGoyJ6bOBcS3b1K3/SGQI 9TNfxiZpcxQdJE6D8N3cLe6SD1vFl0JgPjnT7H3Bp9ZvjCkErZ3rrL3+FHok7bJcEy1bjs qAFdlDkTVNQNxsb8YvA8cilYwL6p8fhu05AmxOMAM4CdE6HlGH9w8TNB93aGeQ7+SN6ZVj RP31LxDd3qXGx6NMvY84Gr1EdizMJPsPH4h4B2MMSHuFVZVlY/28+O38BAGjLg== 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 4RvVdK53kNz8CY; Mon, 25 Sep 2023 17:45:09 +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 38PHj9it028368; Mon, 25 Sep 2023 17:45:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38PHj93p028365; Mon, 25 Sep 2023 17:45:09 GMT (envelope-from git) Date: Mon, 25 Sep 2023 17:45:09 GMT Message-Id: <202309251745.38PHj93p028365@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: fb3c249ed93c - main - 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/main X-Git-Reftype: branch X-Git-Commit: fb3c249ed93c834d70f8361215bc40a9e9004d3b Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=fb3c249ed93c834d70f8361215bc40a9e9004d3b commit fb3c249ed93c834d70f8361215bc40a9e9004d3b Author: Bjoern A. Zeeb AuthorDate: 2023-09-24 11:55:11 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-25 17:41:30 +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 MFC after: 3 days Reported by: Phil Nelson (phil netbsd org) --- 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 09a315de9fd6..8d0bee068c6a 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);