From 2f79088e38714793caf3280a6039e8ad7f1dac69 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Tue, 24 Aug 2010 22:54:05 +0200 Subject: [PATCH] --- yaml --- r: 210252 b: refs/heads/master c: f880c2050f30b23c9b6f80028c09f76e693bf309 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/p54/txrx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 06d2b9334a46..d959ae4f7797 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d8e1ba76d619dbc0be8fbeee4e6c683b5c812d3a +refs/heads/master: f880c2050f30b23c9b6f80028c09f76e693bf309 diff --git a/trunk/drivers/net/wireless/p54/txrx.c b/trunk/drivers/net/wireless/p54/txrx.c index 173aec3d6e7e..0e937dc0c9c4 100644 --- a/trunk/drivers/net/wireless/p54/txrx.c +++ b/trunk/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;