aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorherton <herton@mandriva.com.br>2008-11-27 19:53:24 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-12-05 09:32:59 -0500
commitd9a1f48648edbe99fa432626ce6964a1b58f7281 (patch)
tree5042dad1a4a5c9ba4416774c700840f782e31c01
parent007e5ddddfed4ba039899754936e89b27d5cb551 (diff)
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 <herton@mandriva.com.br> Tested-by: Hin-Tak Leung <htl10@users.sourceforge.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/rtl818x/rtl8187_dev.c4
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 69ea5222f163..dbf52e8bbd7a 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)
238 hdr->flags = cpu_to_le32(flags); 238 hdr->flags = cpu_to_le32(flags);
239 hdr->len = 0; 239 hdr->len = 0;
240 hdr->rts_duration = rts_dur; 240 hdr->rts_duration = rts_dur;
241 hdr->retry = cpu_to_le32(info->control.rates[0].count << 8); 241 hdr->retry = cpu_to_le32((info->control.rates[0].count - 1) << 8);
242 buf = hdr; 242 buf = hdr;
243 243
244 ep = 2; 244 ep = 2;
@@ -256,7 +256,7 @@ static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
256 memset(hdr, 0, sizeof(*hdr)); 256 memset(hdr, 0, sizeof(*hdr));
257 hdr->flags = cpu_to_le32(flags); 257 hdr->flags = cpu_to_le32(flags);
258 hdr->rts_duration = rts_dur; 258 hdr->rts_duration = rts_dur;
259 hdr->retry = cpu_to_le32(info->control.rates[0].count << 8); 259 hdr->retry = cpu_to_le32((info->control.rates[0].count - 1) << 8);
260 hdr->tx_duration = 260 hdr->tx_duration =
261 ieee80211_generic_frame_duration(dev, priv->vif, 261 ieee80211_generic_frame_duration(dev, priv->vif,
262 skb->len, txrate); 262 skb->len, txrate);