1. fix a regression which was introduced by accident by:
carl9170 firmware: initial WoWLAN support
The BlockACK should not be a NULLFUNC
2. remove superfluous control | 1.
No idea, why the original firmware had that set.
Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
baf->f.hdr.phy.mcs = AR9170_TXRX_PHY_RATE_OFDM_6M;
/* format outgoing BA */
baf->f.hdr.phy.mcs = AR9170_TXRX_PHY_RATE_OFDM_6M;
/* format outgoing BA */
- ba->frame_control = cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_NULLFUNC);
+ ba->frame_control = cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_BACK);
ba->duration = cpu_to_le16(0);
memcpy(ba->ta, ctx->ta, 6);
memcpy(ba->ra, ctx->ra, 6);
ba->duration = cpu_to_le16(0);
memcpy(ba->ta, ctx->ta, 6);
memcpy(ba->ra, ctx->ra, 6);
*/
memset(ba->bitmap, 0x0, sizeof(ba->bitmap));
*/
memset(ba->bitmap, 0x0, sizeof(ba->bitmap));
- /*
- * NB:
- * not entirely sure if this is 100% correct?!
- */
- ba->control = ctx->control | cpu_to_le16(1);
+ ba->control = ctx->control;
ba->start_seq_num = ctx->start_seq_num;
wlan_tx_fw(&baf->s, NULL);
}
ba->start_seq_num = ctx->start_seq_num;
wlan_tx_fw(&baf->s, NULL);
}
/* Brilliant! The BAR provides all necessary MACs! */
memcpy(ctx->ra, bar->ta, 6);
memcpy(ctx->ta, bar->ra, 6);
/* Brilliant! The BAR provides all necessary MACs! */
memcpy(ctx->ra, bar->ta, 6);
memcpy(ctx->ta, bar->ra, 6);
-
- /*
- * NB:
- * not entirely sure if this is 100% correct to force the
- * imm ack bit or not...
- */
- ctx->control = bar->control | cpu_to_le16(1);
+ ctx->control = bar->control;
ctx->start_seq_num = bar->start_seq_num;
}
ctx->start_seq_num = bar->start_seq_num;
}