From ddacbe075dfa5a9316d947bd211ca68bfec912ac Mon Sep 17 00:00:00 2001 From: stsp Date: Sun, 19 Jun 2022 18:27:06 +0000 Subject: [PATCH] Revert previous iwn(4) commit. Later testing done by Christian Schulte suggests that this fix did not in fact help with the issue. And this change broke wireless for other iwn(4) users, as reported by Lucas on bugs@ --- sys/dev/pci/if_iwn.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c index 9602d91aebf..69ecb242154 100644 --- a/sys/dev/pci/if_iwn.c +++ b/sys/dev/pci/if_iwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwn.c,v 1.259 2022/06/15 08:43:17 stsp Exp $ */ +/* $OpenBSD: if_iwn.c,v 1.260 2022/06/19 18:27:06 stsp Exp $ */ /*- * Copyright (c) 2007-2010 Damien Bergamini @@ -5409,8 +5409,7 @@ iwn_rxon_configure_ht40(struct ieee80211com *ic, struct ieee80211_node *ni) sc->rxon.flags &= ~htole32(IWN_RXON_HT_CHANMODE_MIXED2040 | IWN_RXON_HT_CHANMODE_PURE40 | IWN_RXON_HT_HT40MINUS); - if ((ni->ni_flags & IEEE80211_NODE_HT) && - ieee80211_node_supports_ht_chan40(ni) && + if (ieee80211_node_supports_ht_chan40(ni) && (sco == IEEE80211_HTOP0_SCO_SCA || sco == IEEE80211_HTOP0_SCO_SCB)) { if (sco == IEEE80211_HTOP0_SCO_SCB) -- 2.20.1