Merge pull request #25 from dpShaker/v5.1.5

Add support for pre-configured SeqNum via RadioTap
This commit is contained in:
Christian kimocoder 2017-10-11 20:40:21 +02:00 committed by GitHub
commit 9823a3136b
4 changed files with 7 additions and 2 deletions

View File

@ -3994,6 +3994,7 @@ s32 rtw_monitor_xmit_entry(struct sk_buff *skb, struct net_device *ndev)
pattrib->ldpc = ldpc;
pattrib->stbc = stbc;
pattrib->retry_ctrl = (txflags & 0x08)?_FALSE:_TRUE;
pattrib->sw_seq = (txflags & 0x10)?_TRUE:_FALSE;
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;

View File

@ -112,7 +112,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz , u8 ba
/* offset 12 */
if (!pattrib->qos_en) {
if (!pattrib->qos_en && pattrib->sw_seq == _FALSE) {
SET_TX_DESC_HWSEQ_EN_8812(ptxdesc, 1); /* Hw set sequence number */
} else
SET_TX_DESC_SEQ_8812(ptxdesc, pattrib->seqnum);

View File

@ -122,7 +122,10 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag
if (!pattrib->qos_en) {
/* HW sequence, to fix to use 0 queue. todo: 4AC packets to use auto queue select */
SET_TX_DESC_HWSEQ_EN_8814A(ptxdesc, 1); // Hw set sequence number
if(pattrib->sw_seq == _FALSE)
SET_TX_DESC_HWSEQ_EN_8814A(ptxdesc, 1); // Hw set sequence number
else
SET_TX_DESC_SEQ_8814A(ptxdesc, pattrib->seqnum);
SET_TX_DESC_EN_HWEXSEQ_8814A(ptxdesc, 0);
SET_TX_DESC_DISQSELSEQ_8814A(ptxdesc, 1);
SET_TX_DESC_HW_SSN_SEL_8814A(ptxdesc, 0);

View File

@ -421,6 +421,7 @@ struct pkt_attrib {
u8 rate;
u8 intel_proxim;
u8 retry_ctrl;
u8 sw_seq;
u8 mbssid;
u8 ldpc;
u8 stbc;