git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-intel-fixes' into HEAD
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
p54
/
txrx.c
diff --git
a/drivers/net/wireless/p54/txrx.c
b/drivers/net/wireless/p54/txrx.c
index
173aec3
..
0e937dc
100644
(file)
--- 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;