[src-draft/trunk]: src/sys/dev/pci Don't use driver scanning functions.

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

details:   https://anonhg.NetBSD.org/src-all/rev/146c0654fee7
branches:  trunk
changeset: 1027539:146c0654fee7
user:      Nathanial Sloss <nat%netbsd.org@localhost>
date:      Sat Nov 20 02:02:13 2021 +1100

description:
Don't use driver scanning functions.

Scanning is provied by the 80211 stack.  iwn(4) now scans.

diffstat:

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

diffs (79 lines):

diff -r b668cc010591 -r 146c0654fee7 sys/dev/pci/if_iwn.c
--- a/sys/dev/pci/if_iwn.c      Sat Nov 20 01:57:01 2021 +1100
+++ b/sys/dev/pci/if_iwn.c      Sat Nov 20 02:02:13 2021 +1100
@@ -257,7 +257,7 @@
 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_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
@@ -776,7 +776,7 @@
        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;
@@ -933,6 +933,7 @@
 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;
@@ -943,6 +944,7 @@
        if (error != 0) {
                ieee80211_cancel_scan(vap,0);
        }
+#endif
 }
 
 /*
@@ -950,7 +952,7 @@
  * 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.
  */
-static void
+__unused static void
 iwn_scan_mindwell(struct ieee80211_scan_state *ss)
 {
        /* NB: don't try to abort scan; wait for firmware to finish */
@@ -5064,6 +5066,7 @@
        return 0;
 }
 
+#if 0
 static uint16_t
 iwn_get_active_dwell_time(struct ieee80211_node *ni, uint16_t flags,
     uint8_t n_probes)
@@ -5342,6 +5345,7 @@
        free(buf, M_DEVBUF);
        return 0;
 }
+#endif
 
 static int
 iwn_auth(struct ieee80211vap *vap)