[src-draft/trunk]: src/sys/dev/pci Use correct state machine override functio...

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

details:   https://anonhg.NetBSD.org/src-all/rev/8918ae87730f
branches:  trunk
changeset: 1027408:8918ae87730f
user:      Nathanial Sloss <nat%netbsd.org@localhost>
date:      Thu Sep 24 12:29:49 2020 +1000

description:
Use correct state machine override function.  Disable others.

diffstat:

 sys/dev/pci/if_iwm.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (41 lines):

diff -r d19083dbdf45 -r 8918ae87730f sys/dev/pci/if_iwm.c
--- a/sys/dev/pci/if_iwm.c      Thu Sep 24 12:25:16 2020 +1000
+++ b/sys/dev/pci/if_iwm.c      Thu Sep 24 12:29:49 2020 +1000
@@ -470,9 +470,11 @@
 static int     iwm_setrates(struct iwm_node *);
 #endif
 static int     iwm_media_change(struct ifnet *);
+#if 0
 static int     iwm_do_newstate(struct ieee80211vap *, enum ieee80211_state,
                    int);
-//static void  iwm_newstate_cb(struct work *, void *);
+static void    iwm_newstate_cb(struct work *, void *);
+#endif
 static int     iwm_newstate(struct ieee80211vap *, enum ieee80211_state, int);
 static void    iwm_endscan(struct iwm_softc *);
 static void    iwm_fill_sf_command(struct iwm_softc *, struct iwm_sf_cfg_cmd *,
@@ -6293,7 +6295,7 @@
 }
 
 static int
-iwm_do_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
+iwm_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
 {
        struct ifnet *ifp = vap->iv_ifp;
        struct ieee80211com *ic = vap->iv_ic;
@@ -6466,6 +6468,7 @@
 }
 #endif
 
+#if 0
 static int
 iwm_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
 {
@@ -6489,6 +6492,7 @@
 
        return 0;
 }
+#endif
 
 static void
 iwm_endscan(struct iwm_softc *sc)