From 3f1049271656e0fe12a6ff69b9e7d2a6a1a99543 Mon Sep 17 00:00:00 2001 From: Christian kimocoder Date: Fri, 13 Oct 2017 09:43:11 +0200 Subject: [PATCH] Revert "Add support for pre-configured SeqNum via RadioTap" --- core/rtw_xmit.c | 2 +- hal/rtl8812a/usb/rtl8812au_xmit.c | 2 +- hal/rtl8814a/usb/rtl8814au_xmit.c | 5 +---- include/rtw_xmit.h | 1 - 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/core/rtw_xmit.c b/core/rtw_xmit.c index 2499617..2605af5 100644 --- a/core/rtw_xmit.c +++ b/core/rtw_xmit.c @@ -3941,7 +3941,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; diff --git a/hal/rtl8812a/usb/rtl8812au_xmit.c b/hal/rtl8812a/usb/rtl8812au_xmit.c index b8e0cfa..29b50ad 100755 --- a/hal/rtl8812a/usb/rtl8812au_xmit.c +++ b/hal/rtl8812a/usb/rtl8812au_xmit.c @@ -118,7 +118,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag //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 282f30c..ba53693 100644 --- a/hal/rtl8814a/usb/rtl8814au_xmit.c +++ b/hal/rtl8814a/usb/rtl8814au_xmit.c @@ -122,10 +122,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 cb611ff..64f1f5c 100644 --- a/include/rtw_xmit.h +++ b/include/rtw_xmit.h @@ -384,7 +384,6 @@ struct pkt_attrib u8 rate; u8 intel_proxim; u8 retry_ctrl; - u8 sw_seq; u8 mbssid; u8 ldpc; u8 stbc;