Subject: [PATCH] rtl8187: fix retry count passed in rtl8187_tx

I mistakenly changed retry count passed in rtl8187_tx in previous change
"rtl8187: feedback transmitted packets using tx close descriptor for
8187B". For 8187 it should represent the number of retries (retry count
limit). As explained by Johannes Berg, .count represents the number of
tries (not retries), and retries = tries - 1.

Signed-off-by: Herton Ronaldo Krzesinski <[email protected]>
---
drivers/net/wireless/rtl818x/rtl8187_dev.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/rtl818x/rtl8187_dev.c b/drivers/net/wireless/rtl818x/rtl8187_dev.c
index ceebeb7..41444e2 100644
--- a/drivers/net/wireless/rtl818x/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8187_dev.c
@@ -238,7 +238,7 @@ static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
hdr->flags = cpu_to_le32(flags);
hdr->len = 0;
hdr->rts_duration = rts_dur;
- hdr->retry = cpu_to_le32(info->control.rates[0].count << 8);
+ hdr->retry = cpu_to_le32((info->control.rates[0].count - 1) << 8);
buf = hdr;

ep = 2;
@@ -256,7 +256,7 @@ static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
memset(hdr, 0, sizeof(*hdr));
hdr->flags = cpu_to_le32(flags);
hdr->rts_duration = rts_dur;
- hdr->retry = cpu_to_le32(info->control.rates[0].count << 8);
+ hdr->retry = cpu_to_le32((info->control.rates[0].count - 1) << 8);
hdr->tx_duration =
ieee80211_generic_frame_duration(dev, priv->vif,
skb->len, txrate);
--
1.6.0.4



2008-11-28 02:09:26

by Hin-Tak Leung

[permalink] [raw]
Subject: Re: [PATCH] rtl8187: fix retry count passed in rtl8187_tx

On Fri, Nov 28, 2008 at 12:53 AM, herton <[email protected]> wrote:
> I mistakenly changed retry count passed in rtl8187_tx in previous change
> "rtl8187: feedback transmitted packets using tx close descriptor for
> 8187B". For 8187 it should represent the number of retries (retry count
> limit). As explained by Johannes Berg, .count represents the number of
> tries (not retries), and retries = tries - 1.
>
> Signed-off-by: Herton Ronaldo Krzesinski <[email protected]>
Tested-by: Hin-Tak Leung <[email protected]>

Just rebuilt, did not expect any problem and there isn't.

Hin-Tak