diff options
| author | John W. Linville | 2010-09-24 21:52:34 +0200 |
|---|---|---|
| committer | John W. Linville | 2010-09-24 21:52:34 +0200 |
| commit | 29ad2facd47f8e37eab8b156e2c384fa181c8b4a (patch) | |
| tree | 25d4df186cd631810ff15a8e7d37cb6cdd806cdb /drivers/net/wireless/p54 | |
| parent | ath9k: make the driver specific rate control module optional (diff) | |
| parent | mac80211: fix use-after-free (diff) | |
| download | kernel-qcow2-linux-29ad2facd47f8e37eab8b156e2c384fa181c8b4a.tar.gz kernel-qcow2-linux-29ad2facd47f8e37eab8b156e2c384fa181c8b4a.tar.xz kernel-qcow2-linux-29ad2facd47f8e37eab8b156e2c384fa181c8b4a.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/ath/ath5k/base.c
net/mac80211/main.c
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 8f67db487f57..76b2318a7dc7 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; |