diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-01 12:01:05 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-01 12:01:05 -0700 |
| commit | a3f86ec002774f28b9b3d1d5e5532231e96a0861 (patch) | |
| tree | 740ea059803c6e377e930b19bc8e37134e2b5051 /drivers/net/wireless/p54 | |
| parent | b963ea89f00f13c648af4082e5efb2172d369727 (diff) | |
| parent | 904879748d7439a6dabdc6be9aad983e216b027d (diff) | |
| download | blackbird-op-linux-a3f86ec002774f28b9b3d1d5e5532231e96a0861.tar.gz blackbird-op-linux-a3f86ec002774f28b9b3d1d5e5532231e96a0861.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/p54')
| -rw-r--r-- | drivers/net/wireless/p54/txrx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/p54/txrx.c index 173aec3d6e7e..0e937dc0c9c4 100644 --- a/drivers/net/wireless/p54/txrx.c +++ b/drivers/net/wireless/p54/txrx.c @@ -446,7 +446,7 @@ static void p54_rx_frame_sent(struct p54_common *priv, struct sk_buff *skb) } 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; |
