[src-draft/trunk]: src/sys/dev/pci Cosmetic changes to match the form of rtwn...

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

details:   https://anonhg.NetBSD.org/src-all/rev/53da32f726ee
branches:  trunk
changeset: 369223:53da32f726ee
user:      Nathanial Sloss <nat%netbsd.org@localhost>
date:      Sun Oct 04 18:50:37 2020 +1100

description:
Cosmetic changes to match the form of rtwn. NFCI.

diffstat:

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

diffs (51 lines):

diff -r e6cae06d3cee -r 53da32f726ee sys/dev/pci/if_iwm.c
--- a/sys/dev/pci/if_iwm.c      Sun Oct 04 18:49:02 2020 +1100
+++ b/sys/dev/pci/if_iwm.c      Sun Oct 04 18:50:37 2020 +1100
@@ -8262,6 +8262,8 @@
                    device_xname(self));
 #endif
 
+       ieee80211_announce(ic);
+
 #if 0
        if (pmf_device_register(self, NULL, iwm_resume))
                pmf_class_network_register(self, vap->iv_ifp);
@@ -8271,8 +8273,6 @@
        }
 #endif
 
-       ieee80211_announce(ic);
-
        return 0;
 }
 
diff -r e6cae06d3cee -r 53da32f726ee sys/dev/pci/if_iwn.c
--- a/sys/dev/pci/if_iwn.c      Sun Oct 04 18:49:02 2020 +1100
+++ b/sys/dev/pci/if_iwn.c      Sun Oct 04 18:50:37 2020 +1100
@@ -488,6 +488,7 @@
        callout_init(&sc->calib_to, 0);
        callout_setfunc(&sc->calib_to, iwn_calib_timeout, sc);
        callout_init(&sc->scan_to, 0);
+       callout_setfunc(&sc->scan_to, iwn_next_scan, sc);
 
        pci_aprint_devinfo(pa, NULL);
 
@@ -797,6 +798,9 @@
        /* XXX NetBSD add call to ieee80211_announce for dmesg. */
 
        sc->sc_flags |= IWN_FLAG_ATTACHED;
+
+       ieee80211_announce(ic);
+
 #if 0
        if (pmf_device_register(self, NULL, iwn_resume))
                pmf_class_network_register(self, vap->iv_ifp);
@@ -804,8 +808,6 @@
                aprint_error_dev(self, "couldn't establish power handler\n");
                return 0;
        }
-
-       ieee80211_announce(ic);
 #endif
 
        return 0;