d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Erm, revert r266544; wrong tree.

Browse Source
This commit is contained in:
Edward Tomasz Napierala 2014-05-22 15:00:32 +00:00
parent 983aa498d5
commit 43c2aa0f86
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=266545
1 changed files with 2 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
sys/dev/iwn/if_iwn.c
View File

@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
#include <sys/module.h>
#include <sys/queue.h>
#include <sys/taskqueue.h>
#include <sys/kthread.h>
#include <machine/bus.h>
#include <machine/resource.h>
@ -343,7 +342,6 @@ static void iwn_set_channel(struct ieee80211com *);
static void iwn_scan_curchan(struct ieee80211_scan_state *, unsigned long);
static void iwn_scan_mindwell(struct ieee80211_scan_state *);
static void iwn_hw_reset(void *, int);
static void iwn_reinit_thread(void *);
#ifdef IWN_DEBUG
static char *iwn_get_csr_string(int);
static void iwn_debug_register(struct iwn_softc *);
@ -1199,8 +1197,6 @@ iwn4965_attach(struct iwn_softc *sc, uint16_t pid)
/* Enable normal btcoex */
sc->sc_flags |= IWN_FLAG_BTCOEX;
kthread_add(iwn_reinit_thread, sc, NULL, NULL, 0, 0, "iwn_reinit");
DPRINTF(sc, IWN_DEBUG_TRACE, "%s: end\n",__func__);
return 0;
@ -3887,52 +3883,6 @@ iwn_fatal_intr(struct iwn_softc *sc)
printf(" rx ring: cur=%d\n", sc->rxq.cur);
}
static void
iwn_reinit_thread(void *arg)
{
struct iwn_softc *sc = arg;
int error;
mtx_lock(&sc->sc_mtx);
for (;;) {
struct ifnet *ifp;
struct ieee80211com *ic;
struct ieee80211vap *vap;
msleep(&sc->fwname, &sc->sc_mtx, PCATCH, "iwn_reinit", 0);
ifp = sc->sc_ifp;
ic = ifp->if_l2com;
vap = TAILQ_FIRST(&ic->ic_vaps);
if (vap == NULL) {
printf("%s: null vap\n", __func__);
continue;
}
device_printf(sc->sc_dev, "%s: controller panicked; "
"resetting; iv_state = %d...\n", __func__, vap->iv_state);
mtx_unlock(&sc->sc_mtx);
iwn_stop(sc);
iwn_init(sc);
iwn_start(sc->sc_ifp);
if (vap->iv_state >= IEEE80211_S_AUTH &&
(error = iwn_auth(sc, vap)) != 0) {
device_printf(sc->sc_dev,
"%s: could not move to auth state\n", __func__);
}
if (vap->iv_state >= IEEE80211_S_RUN &&
(error = iwn_run(sc, vap)) != 0) {
device_printf(sc->sc_dev,
"%s: could not move to run state\n", __func__);
}
mtx_lock(&sc->sc_mtx);
}
mtx_unlock(&sc->sc_mtx);
kthread_exit();
}
static void
iwn_intr(void *arg)
{
@ -3994,10 +3944,8 @@ iwn_intr(void *arg)
#endif
/* Dump firmware error log and stop. */
iwn_fatal_intr(sc);
device_printf(sc->sc_dev, "%s: reinit; %p\n",
__func__, &sc->fwname);
wakeup(&sc->fwname);
ifp->if_flags &= ~IFF_UP;
iwn_stop_locked(sc);
goto done;
}
if ((r1 & (IWN_INT_FH_RX | IWN_INT_SW_RX | IWN_INT_RX_PERIODIC)) ||