Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src-draft/trunk]: src/sys/dev/pci newstate callback cleanup.
details: https://anonhg.NetBSD.org/src-all/rev/c0d425c462d2
branches: trunk
changeset: 951268:c0d425c462d2
user: Nathanial Sloss <nat%netbsd.org@localhost>
date: Sun May 24 19:00:16 2020 +1000
description:
newstate callback cleanup.
diffstat:
sys/dev/pci/if_iwn.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diffs (33 lines):
diff -r 16775228034e -r c0d425c462d2 sys/dev/pci/if_iwn.c
--- a/sys/dev/pci/if_iwn.c Sun May 24 18:59:18 2020 +1000
+++ b/sys/dev/pci/if_iwn.c Sun May 24 19:00:16 2020 +1000
@@ -2145,9 +2145,9 @@
static int
iwn_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
{
- struct iwn_softc *sc = vap->iv_ic->ic_softc;
- struct ieee80211com *ic = &sc->sc_ic;
- struct ifnet *ifp = vap->iv_ifp;
+ struct ieee80211com *ic = vap->iv_ic;
+ struct iwn_softc *sc = ic->ic_softc;
+ //struct ifnet *ifp = vap->iv_ifp;
int error;
enum ieee80211_state ostate = vap->iv_state;
@@ -2235,6 +2235,8 @@
case IEEE80211_S_INIT:
sc->sc_flags &= ~IWN_FLAG_SCANNING;
sc->calib.state = IWN_CALIB_STATE_INIT;
+ break;
+#if 0
/*
* Purge the xmit queue so we don't have old frames
* during a new association attempt.
@@ -2246,6 +2248,7 @@
ifp->if_flags &= ~IFF_OACTIVE;
iwn_start(ifp);
break;
+#endif
}
error = (*sc->sc_newstate)(vap, nstate, arg);
Home |
Main Index |
Thread Index |
Old Index