From patchwork Mon Sep 9 21:12:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 13797593 X-Patchwork-Delegate: nbd@nbd.name Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [148.163.129.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 85FE418A92E for ; Mon, 9 Sep 2024 21:12:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.129.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725916365; cv=none; b=GF1uVfZVT7F5f3UUbtOt7HM/c3kQKRhEYCtIcj3JkgolnwDcHnkfRQqn283GdPvK004SIQZM+S9lLWKWDppQWjKYgvmoMiWHP1omzUYwMeO0tcbUhvNjiIeJCIj/tYlr2o00gEzxE6j4yxmFsOf8ELseAU22akGA1inlb83roK4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725916365; c=relaxed/simple; bh=Jv4Pp2gd5XXSCNpOlXV4YGwBjjimYRFNHQFk2s1XqE4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=YBe/xJ4uJByud/mfp6NNOb2ULGJKU7uqkKU+fzVGSjxAzSzT35jO5oSjXx2s+DpUwP49FZIpzaDXnN7UlmGkqSXqiodit6bGbKcEtqvPgGA80B7U+ISYfv2yfwAexIi5FEqgQ54qwUNdy9pkldF+7/36ZATKi2totFbTWMlYGww= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=candelatech.com; spf=pass smtp.mailfrom=candelatech.com; dkim=pass (1024-bit key) header.d=candelatech.com header.i=@candelatech.com header.b=W8Vlm5Uw; arc=none smtp.client-ip=148.163.129.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=candelatech.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=candelatech.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=candelatech.com header.i=@candelatech.com header.b="W8Vlm5Uw" X-Virus-Scanned: Proofpoint Essentials engine Received: from mail3.candelatech.com (mail.candelatech.com [208.74.158.173]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id DEDECAC007E for ; Mon, 9 Sep 2024 21:12:41 +0000 (UTC) Received: from ben-dt5.candelatech.com (unknown [50.251.239.81]) by mail3.candelatech.com (Postfix) with ESMTP id 70DEA13C2B0; Mon, 9 Sep 2024 14:12:41 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 mail3.candelatech.com 70DEA13C2B0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=candelatech.com; s=default; t=1725916361; bh=Jv4Pp2gd5XXSCNpOlXV4YGwBjjimYRFNHQFk2s1XqE4=; h=From:To:Cc:Subject:Date:From; b=W8Vlm5UwRc3nVZhyPRKPFVwXV1TlL037+KB67fLKQsqJlZqQWS6833id87zb5u3bd JC5XXAaXGV/4nEbgg2P1X3754sqbH5d1WspP2vypEqJsl5k2+i4nM2lsik6kadajzp G589+7mbEQtTxlbJBiflHOyZEJ8EgWYt284MXSjg= From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: Ben Greear Subject: [PATCH 1/2] wifi: mt76: mt7996: Add eht radiotap tlv Date: Mon, 9 Sep 2024 14:12:37 -0700 Message-ID: <20240909211238.3237111-1-greearb@candelatech.com> X-Mailer: git-send-email 2.42.0 Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MDID: 1725916362-zyiYSd8_EH3h X-MDID-O: us5;ut7;1725916362;zyiYSd8_EH3h;;f7146c1849a4b08a52804beb1c1cdf45 From: Ben Greear This duplicates what the 7925 driver is doing, wireshark seems to at least mostly decode it as expected. Signed-off-by: Ben Greear --- drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c index bc7111a71f98..e3ebdb1f7e9a 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7996/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mac.c @@ -679,14 +679,25 @@ mt7996_mac_fill_rx(struct mt7996_dev *dev, enum mt76_rxq_id q, if (ieee80211_has_a4(fc) && is_mesh && status->amsdu) *qos &= ~IEEE80211_QOS_CTL_A_MSDU_PRESENT; } + skb_set_mac_header(skb, (unsigned char *)hdr - skb->data); } else { status->flag |= RX_FLAG_8023; mt7996_wed_check_ppe(dev, &dev->mt76.q_rx[q], msta, skb, *info); } - if (rxv && mode >= MT_PHY_TYPE_HE_SU && !(status->flag & RX_FLAG_8023)) - mt76_connac3_mac_decode_he_radiotap(skb, rxv, mode); + if (rxv && !(status->flag & RX_FLAG_8023)) { + switch (status->encoding) { + case RX_ENC_EHT: + mt76_connac3_mac_decode_eht_radiotap(skb, rxv, mode); + break; + case RX_ENC_HE: + mt76_connac3_mac_decode_he_radiotap(skb, rxv, mode); + break; + default: + break; + } + } if (!status->wcid || !ieee80211_is_data_qos(fc) || hw_aggr) return 0; From patchwork Mon Sep 9 21:12:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 13797594 X-Patchwork-Delegate: nbd@nbd.name Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [148.163.129.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 891B718C00E for ; Mon, 9 Sep 2024 21:12:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.129.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725916372; cv=none; b=GlUMh+nELarDMlhggK1diOBCxS5NhLbVl+sDORwgh+jljGdf/RrSZZGXJbny4sbYnIwaY4kBztRdxrtVyuY3U/vdutxGAu3vHX2gabEgb5qxF/mJnJD9JMoAipWPr9igMiTN52Ssk1tHR48xs3YtJNBXfCPtpu9ZDqs0msF4XR4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725916372; c=relaxed/simple; bh=go2p7n5wPCB3gohcacdZcVGJoxZPBVmwUC406VuzS+M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CDgnqfKQxojOk4rEL7uSdRjMZ6H/KmqbEjbSy0gF2mqvYf6nI3vmXydnQHD3km8EJCUoehWUzXecbhQBKL4Pl54R02vhZv38+VOoiochIWhaLg+SGZYzfLczFN81LciSjcddtD4RNh1E1f2La2WGHep7Fss69JupncDQeoIdv5E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=candelatech.com; spf=pass smtp.mailfrom=candelatech.com; dkim=pass (1024-bit key) header.d=candelatech.com header.i=@candelatech.com header.b=ozc22wyZ; arc=none smtp.client-ip=148.163.129.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=candelatech.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=candelatech.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=candelatech.com header.i=@candelatech.com header.b="ozc22wyZ" X-Virus-Scanned: Proofpoint Essentials engine Received: from mail3.candelatech.com (mail.candelatech.com [208.74.158.173]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 015DD240086 for ; Mon, 9 Sep 2024 21:12:42 +0000 (UTC) Received: from ben-dt5.candelatech.com (unknown [50.251.239.81]) by mail3.candelatech.com (Postfix) with ESMTP id 97A8A13C2B0; Mon, 9 Sep 2024 14:12:42 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 mail3.candelatech.com 97A8A13C2B0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=candelatech.com; s=default; t=1725916362; bh=go2p7n5wPCB3gohcacdZcVGJoxZPBVmwUC406VuzS+M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ozc22wyZ3DgO0AdpJtNsOUHi8IAWVOnxbRQ3Lep0rwh31eiu7dpcz52RDgU8PZwao ZtG2FBEypbdoXJMW6APdKKvbqR1crRU0Rr1UwJDc5ero64S1wSEGAXT3TJ6+wiz25G MQNb0QuS27F03XshZJPf1wG6s0QpxIViWjIF6grk= From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: Ben Greear Subject: [PATCH 2/2] wifi: mt76: Fix EHT NSS radiotap reporting. Date: Mon, 9 Sep 2024 14:12:38 -0700 Message-ID: <20240909211238.3237111-2-greearb@candelatech.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240909211238.3237111-1-greearb@candelatech.com> References: <20240909211238.3237111-1-greearb@candelatech.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MDID: 1725916363-inZJBaekZ1hA X-MDID-O: us5;ut7;1725916363;inZJBaekZ1hA;;f7146c1849a4b08a52804beb1c1cdf45 From: Ben Greear Wireshark and iwlwifi use zero-based NSS reporting, adjust mt76 to do the same. Signed-off-by: Ben Greear --- drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.c b/drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.c index 92ad1ecf6c9d..2d300948308d 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.c @@ -231,7 +231,8 @@ void mt76_connac3_mac_decode_eht_radiotap(struct sk_buff *skb, __le32 *rxv, EHT_PREP(DATA0_PE_DISAMBIGUITY_OM, PE_DISAMBIG, rxv[5]) | EHT_PREP(DATA0_LDPC_EXTRA_SYM_OM, LDPC_EXT_SYM, rxv[4]); - eht->data[7] |= le32_encode_bits(status->nss, IEEE80211_RADIOTAP_EHT_DATA7_NSS_S); + /* iwlwifi and wireshark expect radiotap to report zero-based NSS, so subtract 1. */ + eht->data[7] |= le32_encode_bits(status->nss - 1, IEEE80211_RADIOTAP_EHT_DATA7_NSS_S); eht->user_info[0] |= EHT_BITS(USER_INFO_MCS_KNOWN) | @@ -240,7 +241,7 @@ void mt76_connac3_mac_decode_eht_radiotap(struct sk_buff *skb, __le32 *rxv, EHT_BITS(USER_INFO_BEAMFORMING_KNOWN_O) | EHT_BITS(USER_INFO_DATA_FOR_USER) | le32_encode_bits(status->rate_idx, IEEE80211_RADIOTAP_EHT_USER_INFO_MCS) | - le32_encode_bits(status->nss, IEEE80211_RADIOTAP_EHT_USER_INFO_NSS_O); + le32_encode_bits(status->nss - 1, IEEE80211_RADIOTAP_EHT_USER_INFO_NSS_O); if (le32_to_cpu(rxv[0]) & MT_PRXV_TXBF) eht->user_info[0] |= EHT_BITS(USER_INFO_BEAMFORMING_O);