[src-draft/trunk]: src/sys/dev/pci Follow the same naming conventions and fuc...

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

details:   https://anonhg.NetBSD.org/src-all/rev/77f3de8535b5
branches:  trunk
changeset: 947783:77f3de8535b5
user:      Nathanial Sloss <nat%netbsd.org@localhost>
date:      Thu Sep 03 21:49:24 2020 +1000

description:
Follow the same naming conventions and fuction prototype for iwm_newassoc
as for iwn.

diffstat:

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

diffs (39 lines):

diff -r 02b8967d2154 -r 77f3de8535b5 sys/dev/pci/if_iwm.c
--- a/sys/dev/pci/if_iwm.c      Thu Sep 03 21:48:06 2020 +1000
+++ b/sys/dev/pci/if_iwm.c      Thu Sep 03 21:49:24 2020 +1000
@@ -461,7 +461,7 @@
                    uint32_t, int);
 static int     iwm_update_quotas(struct iwm_softc *, struct iwm_node *);
 static int     iwm_auth(struct ieee80211vap *);
-static int     iwm_assoc(struct iwm_softc *);
+static void    iwm_newassoc(struct ieee80211_node *, int);
 static void    iwm_calib_timeout(void *);
 #ifndef IEEE80211_NO_HT
 static void    iwm_setrates_task(void *);
@@ -6068,11 +6068,11 @@
        return 0;
 }
 
-static int
-iwm_assoc(struct iwm_softc *sc)
-{
-       struct ieee80211com *ic = &sc->sc_ic;
-       struct iwm_node *in = (struct iwm_node *)ic->ic_bss;
+static void
+iwm_newassoc(struct ieee80211_node *ni, int isnew)
+{
+       struct iwm_softc *sc = ni->ni_ic->ic_ifp->if_softc;
+       struct iwm_node *in = (void *)ni;
        int err;
 
        err = iwm_add_sta_cmd(sc, in, 1);
@@ -6355,7 +6355,8 @@
                break;
 
        case IEEE80211_S_ASSOC:
-               err = iwm_assoc(sc);
+               in = (struct iwm_node *)vap->iv_bss;
+               err = iwm_newassoc(in, 1);
                if (err) {
                        DPRINTF(("%s: failed to associate: %d\n", DEVNAME(sc),
                            err));