[src-draft/trunk]: src/sys/dev/pci Reorder the use of ieee80211_init.

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

details:   https://anonhg.NetBSD.org/src-all/rev/9bc5e84539df
branches:  trunk
changeset: 942173:9bc5e84539df
user:      Nathanial Sloss <nat%netbsd.org@localhost>
date:      Tue May 12 04:04:00 2020 +1000

description:
Reorder the use of ieee80211_init.

diffstat:

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

diffs (39 lines):

diff -r f9e6c5e40c8b -r 9bc5e84539df sys/dev/pci/if_iwn.c
--- a/sys/dev/pci/if_iwn.c      Tue May 12 04:03:03 2020 +1000
+++ b/sys/dev/pci/if_iwn.c      Tue May 12 04:04:00 2020 +1000
@@ -2012,6 +2012,7 @@
            (IFF_UP | IFF_RUNNING)) {
                iwn_stop(ifp, 0);
                error = iwn_init(ifp);
+               ieee80211_init(ifp);
        }
        return 0;
 }
@@ -3460,8 +3461,10 @@
                if ((error = ifioctl_common(ifp, cmd, data)) != 0)
                        break;
                if (ifp->if_flags & IFF_UP) {
-                       if (!(ifp->if_flags & IFF_RUNNING))
+                       if (!(ifp->if_flags & IFF_RUNNING)) {
                                error = iwn_init(ifp);
+                               ieee80211_init(ifp);
+                       }
                } else {
                        if (ifp->if_flags & IFF_RUNNING)
                                iwn_stop(ifp, 1);
@@ -3496,6 +3499,7 @@
                    (IFF_UP | IFF_RUNNING)) {
 //                     iwn_stop(ifp, 0);
                        iwn_init(ifp);
+                       ieee80211_init(ifp);
                }
                error = 0;
        }
@@ -6588,7 +6592,6 @@
                ieee80211_new_state(vap, IEEE80211_S_RUN, -1);
 
        sc->sc_flags |= IWN_FLAG_HW_INITED;
-       ieee80211_init(ifp);
 out:
        mutex_exit(&sc->sc_mtx);
        return 0;