View | Details | Raw Unified | Return to bug 197143 | Differences between
and this patch

Collapse All | Expand All

(-)sys/dev/wpi/if_wpi.c (-5 / +5 lines)
Lines 2408-2413 Link Here
2408
	if (++ring->queued > WPI_TX_RING_HIMARK)
2408
	if (++ring->queued > WPI_TX_RING_HIMARK)
2409
		sc->qfullmsk |= 1 << ring->qid;
2409
		sc->qfullmsk |= 1 << ring->qid;
2410
2410
2411
	if (ring->qid < WPI_CMD_QUEUE_NUM)
2412
		sc->sc_tx_timer = 5;
2413
2411
	DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END, __func__);
2414
	DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END, __func__);
2412
2415
2413
	WPI_TXQ_UNLOCK(sc);
2416
	WPI_TXQ_UNLOCK(sc);
Lines 2722-2729 Link Here
2722
		return error;
2725
		return error;
2723
	}
2726
	}
2724
2727
2725
	sc->sc_tx_timer = 5;
2726
2727
	DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END, __func__);
2728
	DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END, __func__);
2728
2729
2729
	return 0;
2730
	return 0;
Lines 2771-2778 Link Here
2771
			ieee80211_free_node(ni);
2772
			ieee80211_free_node(ni);
2772
			WPI_LOCK(sc);
2773
			WPI_LOCK(sc);
2773
			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
2774
			if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
2774
		} else
2775
		}
2775
			sc->sc_tx_timer = 5;
2776
	}
2776
	}
2777
2777
2778
	DPRINTF(sc, WPI_DEBUG_XMIT, "%s: done\n", __func__);
2778
	DPRINTF(sc, WPI_DEBUG_XMIT, "%s: done\n", __func__);
Lines 3195-3203 Link Here
3195
{
3195
{
3196
	struct wpi_softc *sc = ifp->if_softc;
3196
	struct wpi_softc *sc = ifp->if_softc;
3197
3197
3198
	WPI_LOCK(sc);
3198
	wpi_set_promisc(sc);
3199
	wpi_set_promisc(sc);
3199
3200
3200
	WPI_LOCK(sc);
3201
	if (wpi_send_rxon(sc, 1, 1) != 0) {
3201
	if (wpi_send_rxon(sc, 1, 1) != 0) {
3202
		device_printf(sc->sc_dev, "%s: could not send RXON\n",
3202
		device_printf(sc->sc_dev, "%s: could not send RXON\n",
3203
		    __func__);
3203
		    __func__);

Return to bug 197143