[src-draft/trunk]: src/sys/dev/pci Revert 1034574:285de0a9834b.

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

details:   https://anonhg.NetBSD.org/src-all/rev/a9a49b71debf
branches:  trunk
changeset: 377147:a9a49b71debf
user:      Nathanial Sloss <nat%netbsd.org@localhost>
date:      Thu Apr 27 22:17:50 2023 +1000

description:
Revert 1034574:285de0a9834b.

Driver scanning functions work, the suspect commit has been found.

diffstat:

 sys/dev/pci/if_iwn.c |  20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)

diffs (79 lines):

diff -r 2f5ec545a0db -r a9a49b71debf sys/dev/pci/if_iwn.c
--- a/sys/dev/pci/if_iwn.c      Wed Apr 26 22:51:47 2023 +1000
+++ b/sys/dev/pci/if_iwn.c      Thu Apr 27 22:17:50 2023 +1000
@@ -257,7 +257,7 @@ static void iwn_scan_start(struct ieee80
 static void    iwn_scan_end(struct ieee80211com *);
 static void    iwn_set_channel(struct ieee80211com *);
 static void    iwn_scan_curchan(struct ieee80211_scan_state *, unsigned long);
-//static void  iwn_scan_mindwell(struct ieee80211_scan_state *);
+static void    iwn_scan_mindwell(struct ieee80211_scan_state *);
 static void    iwn_next_scan(void *);
 static int     iwn_reset(struct ieee80211vap *, u_long);
 static int     iwn_transmit(struct ieee80211com *, struct mbuf *);
@@ -351,11 +351,11 @@ static int        iwn_config_bt_coex_adv1(struc
 static int     iwn_config_bt_coex_adv2(struct iwn_softc *);
 
 static int     iwn_config(struct ieee80211vap *);
-//static uint16_t      iwn_get_active_dwell_time(struct ieee80211_node *, uint16_t,
-                  // uint8_t);
-//static uint16_t      iwn_limit_dwell(struct ieee80211_node *, uint16_t);
-//static uint16_t      iwn_get_passive_dwell_time(struct ieee80211_node *, uint16_t);
-//static int   iwn_scan(struct ieee80211com *, struct ieee80211_scan_state *);
+static uint16_t        iwn_get_active_dwell_time(struct ieee80211_node *, uint16_t,
+                   uint8_t);
+static uint16_t        iwn_limit_dwell(struct ieee80211_node *, uint16_t);
+static uint16_t        iwn_get_passive_dwell_time(struct ieee80211_node *, uint16_t);
+static int     iwn_scan(struct ieee80211com *, struct ieee80211_scan_state *);
 static int     iwn_auth(struct ieee80211vap *);
 static int     iwn_run(struct ieee80211vap *);
 #ifdef IWN_HWCRYPTO
@@ -785,7 +785,7 @@ iwn_config_complete(device_t self)
        ic->ic_scan_end = iwn_scan_end;
        ic->ic_set_channel = iwn_set_channel;
        ic->ic_scan_curchan = iwn_scan_curchan;
-       //ic->ic_scan_mindwell = iwn_scan_mindwell;
+       ic->ic_scan_mindwell = iwn_scan_mindwell;
        ic->ic_newassoc = iwn_newassoc;
        ic->ic_transmit = iwn_transmit;
        ic->ic_raw_xmit = iwn_raw_xmit;
@@ -938,7 +938,6 @@ printf("SET_CHANNEL\n");
 static void
 iwn_scan_curchan(struct ieee80211_scan_state *ss, unsigned long maxdwell)
 {
-#if 0
        struct ieee80211vap *vap = ss->ss_vap;
        struct ieee80211com *ic = vap->iv_ic;
        int error;
@@ -949,7 +948,6 @@ iwn_scan_curchan(struct ieee80211_scan_s
        if (error != 0) {
                ieee80211_cancel_scan(vap,0);
        }
-#endif
 }
 
 /*
@@ -957,7 +955,7 @@ iwn_scan_curchan(struct ieee80211_scan_s
  * The intent is to terminate the scan but we just let the firmware
  * notify us when it's finished as we have no safe way to abort it.
  */
-__unused static void
+static void
 iwn_scan_mindwell(struct ieee80211_scan_state *ss)
 {
        /* NB: don't try to abort scan; wait for firmware to finish */
@@ -5046,7 +5044,6 @@ iwn_config(struct ieee80211vap *vap)
        return 0;
 }
 
-#if 0
 static uint16_t
 iwn_get_active_dwell_time(struct ieee80211_node *ni, uint16_t flags,
     uint8_t n_probes)
@@ -5325,7 +5322,6 @@ iwn_scan(struct ieee80211com *ic, struct
        free(buf, M_DEVBUF);
        return 0;
 }
-#endif
 
 static int
 iwn_auth(struct ieee80211vap *vap)