diff --git a/core/rtw_xmit.c b/core/rtw_xmit.c index 0c6368d..c1019bb 100644 --- a/core/rtw_xmit.c +++ b/core/rtw_xmit.c @@ -3875,7 +3875,7 @@ s32 rtw_monitor_xmit_entry(struct sk_buff *skb, struct net_device *ndev) u32 len = skb->len; u8 category, action; int type = -1; - + //RTW_INFO(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); if (skb) @@ -3923,17 +3923,17 @@ s32 rtw_monitor_xmit_entry(struct sk_buff *skb, struct net_device *ndev) fixed_rate = 0; fixed_rate += MGN_MCS0; } - if ((mcs_have & 4) && + if ((mcs_have & 4) && (iterator.this_arg[1] & 4)) sgi = 1; - if ((mcs_have & 1) && + if ((mcs_have & 1) && (iterator.this_arg[1] & 1)) bwidth = 1; - if ((mcs_have & 0x10) && + if ((mcs_have & 0x10) && (iterator.this_arg[1] & 0x10)) ldpc = 1; if ((mcs_have & 0x20)) - stbc = (iterator.this_arg[1] >> 5) & 3; + stbc = (iterator.this_arg[1] >> 5) & 3; } break; @@ -3995,9 +3995,9 @@ 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; + // pattrib->sw_seq = (txflags & 0x10)?_TRUE:_FALSE; // Adds support for pre-configured SeqNum via RadioTap + - pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; pmlmeext->mgnt_seq = GetSequence(pwlanhdr); diff --git a/hal/rtl8812a/usb/rtl8812au_xmit.c b/hal/rtl8812a/usb/rtl8812au_xmit.c index 68ee167..bc5f941 100644 --- a/hal/rtl8812a/usb/rtl8812au_xmit.c +++ b/hal/rtl8812a/usb/rtl8812au_xmit.c @@ -112,7 +112,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz , u8 ba /* offset 12 */ - if (!pattrib->qos_en && pattrib->sw_seq == _FALSE) { + if (!pattrib->qos_en) { SET_TX_DESC_HWSEQ_EN_8812(ptxdesc, 1); /* Hw set sequence number */ } else SET_TX_DESC_SEQ_8812(ptxdesc, pattrib->seqnum); diff --git a/hal/rtl8814a/usb/rtl8814au_xmit.c b/hal/rtl8814a/usb/rtl8814au_xmit.c index ac60014..0f4d3e1 100644 --- a/hal/rtl8814a/usb/rtl8814au_xmit.c +++ b/hal/rtl8814a/usb/rtl8814au_xmit.c @@ -118,10 +118,7 @@ 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 */ - 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_HWSEQ_EN_8814A(ptxdesc, 1); // Hw set sequence number SET_TX_DESC_EN_HWEXSEQ_8814A(ptxdesc, 0); SET_TX_DESC_DISQSELSEQ_8814A(ptxdesc, 1); SET_TX_DESC_HW_SSN_SEL_8814A(ptxdesc, 0); diff --git a/include/rtw_xmit.h b/include/rtw_xmit.h index d372338..6b5ea43 100644 --- a/include/rtw_xmit.h +++ b/include/rtw_xmit.h @@ -421,7 +421,7 @@ struct pkt_attrib { u8 rate; u8 intel_proxim; u8 retry_ctrl; - u8 sw_seq; + //u8 sw_seq; // Add support for pre-configured SeqNum via RadioTap u8 mbssid; u8 ldpc; u8 stbc;