Attachment 154373 Details for Bug 197143 – Don't use sc->qfullmsk in wpi_start()

[patch] Don't use sc->qfullmsk in wpi_start()

patch-wpi61.diff (text/plain), 1.70 KB, created by Andriy Voskoboinyk on 2015-03-15 14:07:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Voskoboinyk

Created: 2015-03-15 14:07:17 UTC

Size: 1.70 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)
>@@ -2411,6 +2411,7 @@
> static int
> wpi_cmd2(struct wpi_softc *sc, struct wpi_buf *buf)
> {
>+	struct ifnet *ifp = sc->sc_ifp;
> 	struct ieee80211_frame *wh;
> 	struct wpi_tx_cmd *cmd;
> 	struct wpi_tx_data *data;
>@@ -2522,9 +2523,14 @@
> 
> 	if (ring->qid < WPI_CMD_QUEUE_NUM) {
> 		/* Mark TX ring as full if we reach a certain threshold. */
>-		if (++ring->queued > WPI_TX_RING_HIMARK)
>+		if (++ring->queued > WPI_TX_RING_HIMARK) {
> 			sc->qfullmsk |= 1 << ring->qid;
> 
>+			IF_LOCK(&ifp->if_snd);
>+			ifp->if_drv_flags |= IFF_DRV_OACTIVE;
>+			IF_UNLOCK(&ifp->if_snd);
>+		}
>+
> 		callout_reset(&sc->tx_timeout, 5*hz, wpi_tx_timeout, sc);
> 	}
> 
>@@ -2873,24 +2879,18 @@
> 	struct ieee80211_node *ni;
> 	struct mbuf *m;
> 
>+	WPI_LOCK(sc);
> 	DPRINTF(sc, WPI_DEBUG_XMIT, "%s: called\n", __func__);
> 
>-	IF_LOCK(&ifp->if_snd);
>-	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0 ||
>-	    (ifp->if_drv_flags & IFF_DRV_OACTIVE)) {
>-		IF_UNLOCK(&ifp->if_snd);
>-		return;
>-	}
>-	IF_UNLOCK(&ifp->if_snd);
>-
>-	WPI_LOCK(sc);
> 	for (;;) {
>-		if (sc->qfullmsk != 0) {
>-			IF_LOCK(&ifp->if_snd);
>-			ifp->if_drv_flags |= IFF_DRV_OACTIVE;
>+		IF_LOCK(&ifp->if_snd);
>+		if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0 ||
>+		    (ifp->if_drv_flags & IFF_DRV_OACTIVE)) {
> 			IF_UNLOCK(&ifp->if_snd);
> 			break;
> 		}
>+		IF_UNLOCK(&ifp->if_snd);
>+
> 		IFQ_DRV_DEQUEUE(&ifp->if_snd, m);
> 		if (m == NULL)
> 			break;
>@@ -2902,9 +2902,9 @@
> 			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
> 		}
> 	}
>-	WPI_UNLOCK(sc);
> 
> 	DPRINTF(sc, WPI_DEBUG_XMIT, "%s: done\n", __func__);
>+	WPI_UNLOCK(sc);
> }
> 
> static void

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