Attachment 154337 Details for Bug 197143 – wpi_tx_done() shouldn't wait for wpi_start()

[patch] wpi_tx_done() shouldn't wait for wpi_start()

patch-wpi30.diff (text/plain), 2.22 KB, created by Andriy Voskoboinyk on 2015-03-15 12:06:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Voskoboinyk

Created: 2015-03-15 12:06:13 UTC

Size: 2.22 KB

patch

obsolete

>Index: sys/dev/wpi/if_wpi.c
>===================================================================
>--- sys/dev/wpi/if_wpi.c	(revision 279775)
>+++ sys/dev/wpi/if_wpi.c	(working copy)
>@@ -195,6 +195,7 @@
> 		    const struct ieee80211_bpf_params *);
> static void	wpi_start(struct ifnet *);
> static void	wpi_start_locked(struct ifnet *);
>+static void	wpi_start_task(void *, int);
> static void	wpi_watchdog_rfkill(void *);
> static void	wpi_watchdog(void *);
> static int	wpi_ioctl(struct ifnet *, u_long, caddr_t);
>@@ -515,6 +516,7 @@
> 	TASK_INIT(&sc->sc_reinittask, 0, wpi_hw_reset, sc);
> 	TASK_INIT(&sc->sc_radiooff_task, 0, wpi_radio_off, sc);
> 	TASK_INIT(&sc->sc_radioon_task, 0, wpi_radio_on, sc);
>+	TASK_INIT(&sc->sc_start_task, 0, wpi_start_task, sc);
> 
> 	wpi_sysctlattach(sc);
> 
>@@ -644,6 +646,7 @@
> 		ieee80211_draintask(ic, &sc->sc_reinittask);
> 		ieee80211_draintask(ic, &sc->sc_radiooff_task);
> 		ieee80211_draintask(ic, &sc->sc_radioon_task);
>+		ieee80211_draintask(ic, &sc->sc_start_task);
> 
> 		wpi_stop(sc);
> 
>@@ -1901,6 +1904,7 @@
> 	struct mbuf *m;
> 	struct ieee80211_node *ni;
> 	struct ieee80211vap *vap;
>+	struct ieee80211com *ic;
> 	int ackfailcnt = stat->ackfailcnt / 2;	/* wpi_mrr_setup() */
> 	int status = le32toh(stat->status);
> 
>@@ -1919,6 +1923,7 @@
> 	m = data->m, data->m = NULL;
> 	ni = data->ni, data->ni = NULL;
> 	vap = ni->ni_vap;
>+	ic = vap->iv_ic;
> 
> 	/*
> 	 * Update rate control statistics for the node.
>@@ -1943,7 +1948,7 @@
> 		if (sc->qfullmsk == 0 &&
> 		    (ifp->if_drv_flags & IFF_DRV_OACTIVE)) {
> 			ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
>-			wpi_start_locked(ifp);
>+			ieee80211_runtask(ic, &sc->sc_start_task);
> 		}
> 	}
> 
>@@ -2789,6 +2794,15 @@
> }
> 
> static void
>+wpi_start_task(void *arg0, int pending)
>+{
>+	struct wpi_softc *sc = arg0;
>+	struct ifnet *ifp = sc->sc_ifp;
>+
>+	wpi_start(ifp);
>+}
>+
>+static void
> wpi_watchdog_rfkill(void *arg)
> {
> 	struct wpi_softc *sc = arg;
>Index: sys/dev/wpi/if_wpivar.h
>===================================================================
>--- sys/dev/wpi/if_wpivar.h	(revision 279775)
>+++ sys/dev/wpi/if_wpivar.h	(working copy)
>@@ -209,6 +209,7 @@
> 	struct task		sc_reinittask;
> 	struct task		sc_radiooff_task;
> 	struct task		sc_radioon_task;
>+	struct task		sc_start_task;
> 
> 	/* Eeprom info. */
> 	uint8_t			cap;

Actions: View | Diff

Attachments on bug 197143: 152282 | 152662 | 152977 | 153911 | 153977 | 153983 | 153985 | 153999 | 154000 | 154002 | 154006 | 154007 | 154009 | 154010 | 154011 | 154013 | 154015 | 154016 | 154017 | 154019 | 154020 | 154021 | 154022 | 154024 | 154026 | 154030 | 154032 | 154033 | 154328 | 154329 | 154330 | 154332 | 154334 | 154335 | 154336 | 154337 | 154338 | 154340 | 154341 | 154343 | 154346 | 154347 | 154348 | 154349 | 154350 | 154351 | 154352 | 154353 | 154354 | 154355 | 154356 | 154357 | 154358 | 154359 | 154360 | 154361 | 154362 | 154363 | 154364 | 154365 | 154366 | 154368 | 154369 | 154370 | 154371 | 154372 | 154373 | 154374 | 154375 | 154378 | 154379 | 154380 | 154381 | 154382 | 154383 | 154384 | 155332 | 155333 | 156164 | 156165 | 156166 | 156167 | 156168 | 156169 | 156170 | 156171 | 156172 | 156173 | 156174 | 156175 | 156176 | 156177 | 156178 | 156179 | 156180 | 156181 | 156182 | 156183 | 156184 | 156185 | 156186 | 156187 | 156188 | 156189 | 156190 | 156191 | 156192 | 156193 | 156194 | 156195