Commit d9a1f486 authored by herton's avatar herton Committed by John W. Linville

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: default avatarHerton Ronaldo Krzesinski <herton@mandriva.com.br>
Tested-by: default avatarHin-Tak Leung <htl10@users.sourceforge.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 007e5ddd
...@@ -238,7 +238,7 @@ static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb) ...@@ -238,7 +238,7 @@ static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
hdr->flags = cpu_to_le32(flags); hdr->flags = cpu_to_le32(flags);
hdr->len = 0; hdr->len = 0;
hdr->rts_duration = rts_dur; 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; buf = hdr;
ep = 2; ep = 2;
...@@ -256,7 +256,7 @@ static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb) ...@@ -256,7 +256,7 @@ static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
memset(hdr, 0, sizeof(*hdr)); memset(hdr, 0, sizeof(*hdr));
hdr->flags = cpu_to_le32(flags); hdr->flags = cpu_to_le32(flags);
hdr->rts_duration = rts_dur; 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 = hdr->tx_duration =
ieee80211_generic_frame_duration(dev, priv->vif, ieee80211_generic_frame_duration(dev, priv->vif,
skb->len, txrate); skb->len, txrate);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment