From: stsp Date: Wed, 6 Oct 2021 13:35:55 +0000 (+0000) Subject: Make sure iwm(4) uses the HT frame format only for data frames. X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=6df2034002597e42bc5b959d05fa30f4d7a01cf9;p=openbsd Make sure iwm(4) uses the HT frame format only for data frames. Non-data frames are not supposed to use HT. This change is for code correctness and does not fix any known issue. And it applies only if the Tx rate has been fixed for testing purposes with a command such as 'ifconfig iwm0 media HT-MCS13 mode 11n'. ok mpi@ --- diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c index 31e60bbfe4f..462b119590b 100644 --- a/sys/dev/pci/if_iwm.c +++ b/sys/dev/pci/if_iwm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwm.c,v 1.371 2021/10/05 10:34:36 stsp Exp $ */ +/* $OpenBSD: if_iwm.c,v 1.372 2021/10/06 13:35:55 stsp Exp $ */ /* * Copyright (c) 2014, 2016 genua gmbh @@ -6354,6 +6354,7 @@ iwm_tx_fill_cmd(struct iwm_softc *sc, struct iwm_node *in, if (IWM_RIDX_IS_CCK(ridx)) rate_flags |= IWM_RATE_MCS_CCK_MSK; if ((ni->ni_flags & IEEE80211_NODE_HT) && + type == IEEE80211_FC0_TYPE_DATA && rinfo->ht_plcp != IWM_RATE_HT_SISO_MCS_INV_PLCP) { rate_flags |= IWM_RATE_MCS_HT_MSK; if (ieee80211_node_supports_ht_sgi20(ni))