diff options
| -rw-r--r-- | sys/dev/ral/rt2860.c | 4 | ||||
| -rw-r--r-- | sys/dev/ral/rt2860var.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/ral/rt2860.c b/sys/dev/ral/rt2860.c index 4b01c9924a9d2..a4e049b6fe971 100644 --- a/sys/dev/ral/rt2860.c +++ b/sys/dev/ral/rt2860.c @@ -1092,10 +1092,12 @@ rt2860_drain_stats_fifo(struct rt2860_softc *sc) DPRINTFN(4, ("tx stat 0x%08x\n", stat)); wcid = (stat >> RT2860_TXQ_WCID_SHIFT) & 0xff; + if (wcid > RT2860_WCID_MAX) + continue; ni = sc->wcid2ni[wcid]; /* if no ACK was requested, no feedback is available */ - if (!(stat & RT2860_TXQ_ACKREQ) || wcid == 0xff || ni == NULL) + if (!(stat & RT2860_TXQ_ACKREQ) || ni == NULL) continue; /* update per-STA AMRR stats */ diff --git a/sys/dev/ral/rt2860var.h b/sys/dev/ral/rt2860var.h index 25953c90850c9..a8c2673cc8a65 100644 --- a/sys/dev/ral/rt2860var.h +++ b/sys/dev/ral/rt2860var.h @@ -142,7 +142,7 @@ struct rt2860_softc { #define RT2860_PCIE (1 << 2) #define RT2860_RUNNING (1 << 3) - struct ieee80211_node *wcid2ni[RT2860_WCID_MAX]; + struct ieee80211_node *wcid2ni[RT2860_WCID_MAX + 1]; struct rt2860_tx_ring txq[6]; struct rt2860_rx_ring rxq; |