[src-draft/trunk]: src/sys/dev/pci Use the right flags when adding ht capabil...

[Nathanial Sloss <nat%netbsd.org@localhost>]

details:   https://anonhg.NetBSD.org/src-all/rev/b6088244727d
branches:  trunk
changeset: 987681:b6088244727d
user:      Nathanial Sloss <nat%netbsd.org@localhost>
date:      Fri Jul 03 12:05:49 2020 +1000

description:
Use the right flags when adding ht capabilities to scan results.

diffstat:

 sys/dev/pci/if_iwn.c |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diffs (24 lines):

diff -r c8eeea904cde -r b6088244727d sys/dev/pci/if_iwn.c
--- a/sys/dev/pci/if_iwn.c      Fri Jul 03 12:04:58 2020 +1000
+++ b/sys/dev/pci/if_iwn.c      Fri Jul 03 12:05:49 2020 +1000
@@ -5267,15 +5267,14 @@
        frm = (uint8_t *)(wh + 1);
        frm = ieee80211_add_ssid(frm, NULL, 0);
        frm = ieee80211_add_rates(frm, rs);
-#ifndef IEEE80211_NO_HT
-#ifdef notyet
-       if (ic->ic_flags & IEEE80211_F_HTON)
-               frm = ieee80211_add_htcaps(frm, ic);
-#endif
-#endif
        if (rs->rs_nrates > IEEE80211_RATE_SIZE)
                frm = ieee80211_add_xrates(frm, rs);
 
+#ifndef IEEE80211_NO_HT
+       if (ni != NULL && ic->ic_htcaps & IEEE80211_HTC_HT)
+               frm = ieee80211_add_htcap(frm, ni);
+#endif
+
        /* Set length of probe request. */
        tx->len = htole16(frm - (uint8_t *)wh);