nexmon – Blame information for rev 1

Subversion Repositories:
Rev:
Rev Author Line No. Line
1 office 1 diff --git a/drivers/net/wireless/rtl818x/rtl8187_dev.c b/drivers/net/wireless/rtl818x/rtl8187_dev.c
2 index 9212cea..08d04a3 100644
3 --- a/drivers/net/wireless/rtl8187_dev.c
4 +++ b/drivers/net/wireless/rtl8187_dev.c
5 @@ -214,7 +214,11 @@ static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
6 hdr->flags = cpu_to_le32(flags);
7 hdr->len = 0;
8 hdr->rts_duration = rts_dur;
9 - hdr->retry = cpu_to_le32(info->control.retry_limit << 8);
10 + if (!(info->flags & IEEE80211_TX_CTL_NO_ACK))
11 + hdr->retry =
12 + cpu_to_le32(info->control.retry_limit << 8);
13 + else
14 + hdr->retry = 0;
15 buf = hdr;
16  
17 ep = 2;
18 @@ -232,7 +235,11 @@ static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
19 memset(hdr, 0, sizeof(*hdr));
20 hdr->flags = cpu_to_le32(flags);
21 hdr->rts_duration = rts_dur;
22 - hdr->retry = cpu_to_le32(info->control.retry_limit << 8);
23 + if (!(info->flags & IEEE80211_TX_CTL_NO_ACK))
24 + hdr->retry =
25 + cpu_to_le32(info->control.retry_limit << 8);
26 + else
27 + hdr->retry = 0;
28 hdr->tx_duration =
29 ieee80211_generic_frame_duration(dev, priv->vif,
30 skb->len, txrate);