Commit 32bfd774 authored by Deren Wu's avatar Deren Wu Committed by Felix Fietkau
Browse files

mt76: fix wrong HE data rate in sniffer tool 



Due to the missing IEEE80211_RADIOTAP_HE_DATA1_BW_RU_ALLOC_KNOWN in
status report, the HE rate in wirehsark/tcpdump always shows wrong value.
Applications will refer to IEEE80211_RADIOTAP_HE_DATA5_DATA_BW_RU_ALLOC
when the flag is set and shows the correct data rate.

Reviewed-by: default avatarRyder Lee <ryder.lee@mediatek.com>
Signed-off-by: default avatarDeren Wu <deren.wu@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 6b7f9aff

drivers/net/wireless/mediatek/mt76/mt7915/mac.c

+4 −2
Original line number Diff line number Diff line
@@ -349,14 +349,16 @@ mt7915_mac_decode_he_radiotap(struct sk_buff *skb, __le32 *rxv, u32 mode) 
	case MT_PHY_TYPE_HE_SU:

		he->data1 |= HE_BITS(DATA1_FORMAT_SU) |

			     HE_BITS(DATA1_UL_DL_KNOWN) |

			     HE_BITS(DATA1_BEAM_CHANGE_KNOWN);

			     HE_BITS(DATA1_BEAM_CHANGE_KNOWN) |

			     HE_BITS(DATA1_BW_RU_ALLOC_KNOWN);



		he->data3 |= HE_PREP(DATA3_BEAM_CHANGE, BEAM_CHNG, rxv[14]) |

			     HE_PREP(DATA3_UL_DL, UPLINK, rxv[2]);

		break;

	case MT_PHY_TYPE_HE_EXT_SU:

		he->data1 |= HE_BITS(DATA1_FORMAT_EXT_SU) |

			     HE_BITS(DATA1_UL_DL_KNOWN);

			     HE_BITS(DATA1_UL_DL_KNOWN) |

			     HE_BITS(DATA1_BW_RU_ALLOC_KNOWN);



		he->data3 |= HE_PREP(DATA3_UL_DL, UPLINK, rxv[2]);

		break;

drivers/net/wireless/mediatek/mt76/mt7921/mac.c

+4 −2
Original line number Diff line number Diff line
@@ -304,14 +304,16 @@ mt7921_mac_decode_he_radiotap(struct sk_buff *skb, __le32 *rxv, u32 mode) 
	case MT_PHY_TYPE_HE_SU:

		he->data1 |= HE_BITS(DATA1_FORMAT_SU) |

			     HE_BITS(DATA1_UL_DL_KNOWN) |

			     HE_BITS(DATA1_BEAM_CHANGE_KNOWN);

			     HE_BITS(DATA1_BEAM_CHANGE_KNOWN) |

			     HE_BITS(DATA1_BW_RU_ALLOC_KNOWN);



		he->data3 |= HE_PREP(DATA3_BEAM_CHANGE, BEAM_CHNG, rxv[14]) |

			     HE_PREP(DATA3_UL_DL, UPLINK, rxv[2]);

		break;

	case MT_PHY_TYPE_HE_EXT_SU:

		he->data1 |= HE_BITS(DATA1_FORMAT_EXT_SU) |

			     HE_BITS(DATA1_UL_DL_KNOWN);

			     HE_BITS(DATA1_UL_DL_KNOWN) |

			     HE_BITS(DATA1_BW_RU_ALLOC_KNOWN);



		he->data3 |= HE_PREP(DATA3_UL_DL, UPLINK, rxv[2]);

		break;