mirror of
https://github.com/aircrack-ng/rtl8812au.git
synced 2024-11-22 21:34:37 +00:00
Some allround fixes (minors)
This commit is contained in:
kimocoder
parent
458645a732
commit
0bb520cbfa
@ -689,7 +689,7 @@ void rtw_hal_turbo_edca(_adapter *adapter)
|
||||
|
||||
EDCA_BE_UL = hal_data->edca_param_mode;
|
||||
EDCA_BE_DL = hal_data->edca_param_mode;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (traffic_index == DOWN_LINK)
|
||||
@ -707,7 +707,7 @@ void rtw_hal_turbo_edca(_adapter *adapter)
|
||||
struct sta_info *psta;
|
||||
struct macid_ctl_t *macid_ctl = dvobj_to_macidctl(dvobj);
|
||||
u8 mac_id, role, current_rate_id;
|
||||
|
||||
|
||||
/* search all used & connect2AP macid */
|
||||
for (mac_id = 0; mac_id < macid_ctl->num; mac_id++) {
|
||||
if (rtw_macid_is_used(macid_ctl, mac_id)) {
|
||||
@ -752,7 +752,7 @@ void rtw_hal_turbo_edca(_adapter *adapter)
|
||||
#endif
|
||||
|
||||
if ( edca_param != hal_data->ac_param_be) {
|
||||
|
||||
|
||||
rtw_hal_set_hwreg(adapter, HW_VAR_AC_PARAM_BE, (u8 *)(&edca_param));
|
||||
|
||||
RTW_INFO("Turbo EDCA =0x%x\n", edca_param);
|
||||
|
||||
@ -31,7 +31,6 @@
|
||||
* Global var
|
||||
* ************************************************************ */
|
||||
|
||||
|
||||
static VOID
|
||||
dm_CheckProtection(
|
||||
IN PADAPTER Adapter
|
||||
@ -141,7 +140,6 @@ dm_InterruptMigration(
|
||||
BOOLEAN IntMtToSet = _FALSE;
|
||||
BOOLEAN ACIntToSet = _FALSE;
|
||||
|
||||
|
||||
/* Retrieve current interrupt migration and Tx four ACs IMR settings first. */
|
||||
bCurrentIntMt = pHalData->bInterruptMigration;
|
||||
bCurrentACIntDisable = pHalData->bDisableTxInt;
|
||||
@ -262,7 +260,6 @@ rtl8812_InitHalDm(
|
||||
/* Adapter->fix_rate = 0xFF; */
|
||||
}
|
||||
|
||||
|
||||
VOID
|
||||
rtl8812_HalDmWatchDog(
|
||||
IN PADAPTER Adapter
|
||||
|
||||
@ -3791,8 +3791,6 @@ SetBeamformRfMode_8812(
|
||||
phy_set_bb_reg(Adapter, rTxPath_Jaguar, bMaskByte1, 0x11);
|
||||
}
|
||||
|
||||
|
||||
|
||||
VOID
|
||||
SetBeamformEnter_8812(
|
||||
IN PADAPTER Adapter,
|
||||
@ -5570,7 +5568,7 @@ u8 GetHalDefVar8812A(PADAPTER padapter, HAL_DEF_VARIABLE variable, void *pval)
|
||||
break;
|
||||
|
||||
case HAL_DEF_RX_STBC:
|
||||
*(u8 *)pval = 1;
|
||||
*(u8 *)pval = 2;
|
||||
break;
|
||||
|
||||
case HAL_DEF_EXPLICIT_BEAMFORMER:
|
||||
|
||||
@ -19,20 +19,9 @@
|
||||
#define RTW_RX_MSDU_ACT_INDICATE BIT0
|
||||
#define RTW_RX_MSDU_ACT_FORWARD BIT1
|
||||
|
||||
#ifdef PLATFORM_OS_XP
|
||||
#ifdef CONFIG_SDIO_HCI
|
||||
#define NR_RECVBUFF 1024/* 512 */ /* 128 */
|
||||
#else
|
||||
#define NR_RECVBUFF (16)
|
||||
#endif
|
||||
#elif defined(PLATFORM_OS_CE)
|
||||
#ifdef CONFIG_SDIO_HCI
|
||||
#define NR_RECVBUFF (128)
|
||||
#else
|
||||
#define NR_RECVBUFF (4)
|
||||
#endif
|
||||
#else /* PLATFORM_LINUX /PLATFORM_BSD */
|
||||
#include <linux/interrupt.h>
|
||||
|
||||
#ifdef PLATFORM_LINUX
|
||||
#ifdef CONFIG_SINGLE_RECV_BUF
|
||||
#define NR_RECVBUFF (1)
|
||||
#else
|
||||
@ -373,25 +362,21 @@ struct recv_priv {
|
||||
#endif /* CONFIG_USB_INTERRUPT_IN_PIPE */
|
||||
|
||||
#endif
|
||||
#if defined(PLATFORM_LINUX) || defined(PLATFORM_FREEBSD)
|
||||
#ifdef PLATFORM_FREEBSD
|
||||
struct task irq_prepare_beacon_tasklet;
|
||||
struct task recv_tasklet;
|
||||
#else /* PLATFORM_FREEBSD */
|
||||
#if defined(PLATFORM_LINUX)
|
||||
struct tasklet_struct irq_prepare_beacon_tasklet;
|
||||
struct tasklet_struct recv_tasklet;
|
||||
#endif /* PLATFORM_FREEBSD */
|
||||
|
||||
struct sk_buff_head free_recv_skb_queue;
|
||||
struct sk_buff_head rx_skb_queue;
|
||||
#ifdef CONFIG_RTW_NAPI
|
||||
struct sk_buff_head rx_napi_skb_queue;
|
||||
#endif
|
||||
#endif
|
||||
#ifdef CONFIG_RX_INDICATE_QUEUE
|
||||
struct task rx_indicate_tasklet;
|
||||
struct ifqueue rx_indicate_queue;
|
||||
#endif /* CONFIG_RX_INDICATE_QUEUE */
|
||||
|
||||
#endif /* defined(PLATFORM_LINUX) || defined(PLATFORM_FREEBSD) */
|
||||
#endif /* defined(PLATFORM_LINUX) */
|
||||
|
||||
u8 *pallocated_recv_buf;
|
||||
u8 *precv_buf; /* 4 alignment */
|
||||
@ -504,7 +489,7 @@ struct recv_buf {
|
||||
|
||||
#ifdef CONFIG_USB_HCI
|
||||
|
||||
#if defined(PLATFORM_OS_XP) || defined(PLATFORM_LINUX) || defined(PLATFORM_FREEBSD)
|
||||
#if defined(PLATFORM_LINUX)
|
||||
PURB purb;
|
||||
dma_addr_t dma_transfer_addr; /* (in) dma addr for transfer_buffer */
|
||||
u32 alloc_sz;
|
||||
@ -517,12 +502,9 @@ struct recv_buf {
|
||||
|
||||
#if defined(PLATFORM_LINUX)
|
||||
_pkt *pskb;
|
||||
#elif defined(PLATFORM_FREEBSD) /* skb solution */
|
||||
struct sk_buff *pskb;
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
head ----->
|
||||
data ----->
|
||||
@ -750,9 +732,6 @@ __inline static _buffer *get_rxbuf_desc(union recv_frame *precvframe)
|
||||
|
||||
if (precvframe == NULL)
|
||||
return NULL;
|
||||
#ifdef PLATFORM_WINDOWS
|
||||
NdisQueryPacket(precvframe->u.hdr.pkt, NULL, NULL, &buf_desc, NULL);
|
||||
#endif
|
||||
|
||||
return buf_desc;
|
||||
}
|
||||
@ -772,13 +751,7 @@ __inline static union recv_frame *pkt_to_recvframe(_pkt *pkt)
|
||||
|
||||
u8 *buf_star;
|
||||
union recv_frame *precv_frame;
|
||||
#ifdef PLATFORM_WINDOWS
|
||||
_buffer *buf_desc;
|
||||
uint len;
|
||||
|
||||
NdisQueryPacket(pkt, NULL, NULL, &buf_desc, &len);
|
||||
NdisQueryBufferSafe(buf_desc, &buf_star, &len, HighPagePriority);
|
||||
#endif
|
||||
precv_frame = rxmem_to_recvframe((unsigned char *)buf_star);
|
||||
|
||||
return precv_frame;
|
||||
|
||||
@ -52,7 +52,6 @@
|
||||
#define SET_VHT_CAPABILITY_ELE_MCS_TX_MAP(_pEleStart, _val) SET_BITS_TO_LE_2BYTE((_pEleStart)+8, 0, 16, _val) /* B0~B15 indicate Tx MCS MAP, we write 0 to indicate MCS0~7. by page */
|
||||
#define SET_VHT_CAPABILITY_ELE_MCS_TX_HIGHEST_RATE(_pEleStart, _val) SET_BITS_TO_LE_2BYTE((_pEleStart)+10, 0, 13, _val)
|
||||
|
||||
|
||||
#define GET_VHT_CAPABILITY_ELE_MAX_MPDU_LENGTH(_pEleStart) LE_BITS_TO_1BYTE(_pEleStart, 0, 2)
|
||||
#define GET_VHT_CAPABILITY_ELE_CHL_WIDTH(_pEleStart) LE_BITS_TO_1BYTE(_pEleStart, 2, 2)
|
||||
#define GET_VHT_CAPABILITY_ELE_RX_LDPC(_pEleStart) LE_BITS_TO_1BYTE(_pEleStart, 4, 1)
|
||||
@ -74,7 +73,6 @@
|
||||
#define GET_VHT_CAPABILITY_ELE_TX_MCS(_pEleStart) ((_pEleStart)+8)
|
||||
#define GET_VHT_CAPABILITY_ELE_MCS_TX_HIGHEST_RATE(_pEleStart) LE_BITS_TO_2BYTE((_pEleStart)+10, 0, 13)
|
||||
|
||||
|
||||
/* VHT Operation Information Element */
|
||||
#define SET_VHT_OPERATION_ELE_CHL_WIDTH(_pEleStart, _val) SET_BITS_TO_LE_1BYTE(_pEleStart, 0, 8, _val)
|
||||
#define SET_VHT_OPERATION_ELE_CHL_CENTER_FREQ1(_pEleStart, _val) SET_BITS_TO_LE_1BYTE(_pEleStart+1, 0, 8, _val)
|
||||
|
||||
@ -4469,8 +4469,8 @@ void rtw_cfg80211_indicate_sta_assoc(_adapter *padapter, u8 *pmgmt_frame, uint f
|
||||
#if defined(RTW_USE_CFG80211_STA_EVENT) || defined(COMPAT_KERNEL_RELEASE)
|
||||
{
|
||||
struct station_info sinfo;
|
||||
_rtw_memset(&sinfo, 0, sizeof(struct station_info));
|
||||
u8 ie_offset;
|
||||
_rtw_memset(&sinfo, 0, sizeof(struct station_info));
|
||||
|
||||
if (get_frame_sub_type(pmgmt_frame) == WIFI_ASSOCREQ)
|
||||
ie_offset = _ASOCREQ_IE_OFFSET_;
|
||||
@ -9623,6 +9623,7 @@ void rtw_cfg80211_init_wiphy(_adapter *padapter)
|
||||
rtw_cfg80211_init_ht_capab(padapter, &band->ht_cap, BAND_ON_5G, rf_type);
|
||||
#endif
|
||||
#if defined(CONFIG_80211AC_VHT) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
|
||||
|
||||
rtw_cfg80211_init_vht_capab(padapter, &band->vht_cap, BAND_ON_5G, rf_type);
|
||||
#endif
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user