X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Fsrc%2Fwlan.c;fp=carlfw%2Fsrc%2Fwlan.c;h=b83e672287c0e971469b878ec124d695bf4d363e;hb=4dbc5363d8036af09f5d361001c3d9d3799dfca7;hp=cb2dc75c0ef43805b86989ec3a9798cbaee764fe;hpb=9f184dae9214e7acd7e8df12a26b0e27a41eafa3;p=carl9170fw.git diff --git a/carlfw/src/wlan.c b/carlfw/src/wlan.c index cb2dc75..b83e672 100644 --- a/carlfw/src/wlan.c +++ b/carlfw/src/wlan.c @@ -305,7 +305,7 @@ static void wlan_assign_seq(struct ieee80211_hdr *hdr, unsigned int vif) hdr->seq_ctrl &= cpu_to_le16(~IEEE80211_SCTL_SEQ); hdr->seq_ctrl |= cpu_to_le16(fw.wlan.sequence[vif]); - if (!(hdr->seq_ctrl & cpu_to_le16(IEEE80211_SCTL_FRAG))) + if (ieee80211_is_first_frag(hdr->seq_ctrl)) fw.wlan.sequence[vif] += 0x10; } @@ -351,6 +351,12 @@ static bool wlan_tx_status(struct dma_queue *queue, /* reset retry indicator flags */ desc->ctrl &= ~(AR9170_CTRL_TXFAIL | AR9170_CTRL_BAFAIL); + /* + * Note: wlan_tx_consume_retry will override the old + * phy [CCK,OFDM, HT, BW20/40, MCS...] and mac vectors + * [AMPDU,RTS/CTS,...] therefore be careful when they + * are used. + */ if (wlan_tx_consume_retry(super)) { /* * retry for simple and aggregated 802.11 frames.