diff options
| author | Christian Lamparter <chunkeey@googlemail.com> | 2010-08-24 22:54:05 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-20 13:36:41 -0700 |
| commit | 13d7e89ea21d11921cc64729341edb3fbdb70ca9 (patch) | |
| tree | aad6ec05f53f4bf178de9d02cda7a3782d4f26b7 | |
| parent | f4d60f54ed93f427219b359a1bbc29e2fc04cc67 (diff) | |
| download | kernel-crypto-13d7e89ea21d11921cc64729341edb3fbdb70ca9.tar.gz kernel-crypto-13d7e89ea21d11921cc64729341edb3fbdb70ca9.tar.xz kernel-crypto-13d7e89ea21d11921cc64729341edb3fbdb70ca9.zip | |
p54: fix tx feedback status flag check
commit f880c2050f30b23c9b6f80028c09f76e693bf309 upstream.
Michael reported that p54* never really entered power
save mode, even tough it was enabled.
It turned out that upon a power save mode change the
firmware will set a special flag onto the last outgoing
frame tx status (which in this case is almost always the
designated PSM nullfunc frame). This flag confused the
driver; It erroneously reported transmission failures
to the stack, which then generated the next nullfunc.
and so on...
Reported-by: Michael Buesch <mb@bu3sch.de>
Tested-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -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 4e6891099d4..ccb2dd1bf02 100644 --- a/drivers/net/wireless/p54/txrx.c +++ b/drivers/net/wireless/p54/txrx.c @@ -444,7 +444,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; |