--- drivers/net/wireless/p54/txrx.c

+++ drivers/net/wireless/p54/txrx.c

@@ -186,7 +186,7 @@ static int p54_tx_qos_accounting_alloc(s

struct ieee80211_tx_queue_stats *queue;

unsigned long flags;

- if (WARN_ON(p54_queue > P54_QUEUE_NUM))

+ if (WARN_ON(p54_queue >= P54_QUEUE_NUM))

return -EINVAL;

queue = &priv->tx_stats[p54_queue];

@@ -445,7 +445,7 @@ static void p54_rx_frame_sent(struct p54

}

if (!(info->flags & IEEE80211_TX_CTL_NO_ACK) &&

- (!payload->status))

+ !(payload->status & P54_TX_FAILED))

info->flags |= IEEE80211_TX_STAT_ACK;

if (payload->status & P54_TX_PSM_CANCELLED)

info->flags |= IEEE80211_TX_STAT_TX_FILTERED;