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

Collapse All | Expand All

(-)sys/dev/wpi/if_wpi.c (-11 / +4 lines)
Lines 1960-1966 Link Here
1960
	/*
1960
	/*
1961
	 * Update rate control statistics for the node.
1961
	 * Update rate control statistics for the node.
1962
	 */
1962
	 */
1963
	WPI_UNLOCK(sc);
1964
	if ((status & 0xff) != 1) {
1963
	if ((status & 0xff) != 1) {
1965
		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
1964
		if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
1966
		ieee80211_ratectl_tx_complete(vap, ni,
1965
		ieee80211_ratectl_tx_complete(vap, ni,
Lines 1972-1978 Link Here
1972
	}
1971
	}
1973
1972
1974
	ieee80211_tx_complete(ni, m, (status & 0xff) != 1);
1973
	ieee80211_tx_complete(ni, m, (status & 0xff) != 1);
1975
	WPI_LOCK(sc);
1976
1974
1977
	WPI_TXQ_STATE_LOCK(sc);
1975
	WPI_TXQ_STATE_LOCK(sc);
1978
	ring->queued -= 1;
1976
	ring->queued -= 1;
Lines 2103-2115 Link Here
2103
			    le32toh(miss->total));
2101
			    le32toh(miss->total));
2104
2102
2105
			if (vap->iv_state == IEEE80211_S_RUN &&
2103
			if (vap->iv_state == IEEE80211_S_RUN &&
2106
			    (ic->ic_flags & IEEE80211_F_SCAN) == 0) {
2104
			    (ic->ic_flags & IEEE80211_F_SCAN) == 0 &&
2107
				if (misses >=  vap->iv_bmissthreshold) {
2105
			    misses >= vap->iv_bmissthreshold)
2108
					WPI_UNLOCK(sc);
2106
				ieee80211_beacon_miss(ic);
2109
					ieee80211_beacon_miss(ic);
2107
2110
					WPI_LOCK(sc);
2111
				}
2112
			}
2113
			break;
2108
			break;
2114
		}
2109
		}
2115
		case WPI_UC_READY:
2110
		case WPI_UC_READY:
Lines 2180-2188 Link Here
2180
			WPI_RXON_LOCK(sc);
2175
			WPI_RXON_LOCK(sc);
2181
			callout_stop(&sc->scan_timeout);
2176
			callout_stop(&sc->scan_timeout);
2182
			WPI_RXON_UNLOCK(sc);
2177
			WPI_RXON_UNLOCK(sc);
2183
			WPI_UNLOCK(sc);
2184
			ieee80211_scan_next(vap);
2178
			ieee80211_scan_next(vap);
2185
			WPI_LOCK(sc);
2186
			break;
2179
			break;
2187
		}
2180
		}
2188
		}
2181
		}

Return to bug 197143