mirror of
https://github.com/RinCat/RTL88x2BU-Linux-Driver.git
synced 2026-01-19 10:26:35 +00:00
Updated to 5.8.7.4
This commit is contained in:
0
include/autoconf.h
Executable file → Normal file
0
include/autoconf.h
Executable file → Normal file
@@ -773,6 +773,9 @@ struct rtw_traffic_statistics {
|
||||
};
|
||||
|
||||
#define SEC_CAP_CHK_BMC BIT0
|
||||
#define MACID_DROP BIT0
|
||||
#define MACID_DROP_INDIRECT BIT1
|
||||
|
||||
|
||||
#define SEC_STATUS_STA_PK_GK_CONFLICT_DIS_BMC_SEARCH BIT0
|
||||
|
||||
@@ -855,22 +858,31 @@ struct macid_ctl_t {
|
||||
|
||||
struct sta_info *sta[MACID_NUM_SW_LIMIT]; /* corresponding stainfo when macid is not shared */
|
||||
|
||||
u8 macid_cap;
|
||||
/* macid sleep registers */
|
||||
#ifdef CONFIG_PROTSEL_MACSLEEP
|
||||
u16 reg_sleep_ctrl;
|
||||
u16 reg_sleep_info;
|
||||
u16 reg_drop_ctrl;
|
||||
u16 reg_drop_info;
|
||||
#else
|
||||
u16 reg_sleep_m0;
|
||||
u16 reg_drop_m0;
|
||||
#if (MACID_NUM_SW_LIMIT > 32)
|
||||
u16 reg_sleep_m1;
|
||||
u16 reg_drop_m1;
|
||||
#endif
|
||||
#if (MACID_NUM_SW_LIMIT > 64)
|
||||
u16 reg_sleep_m2;
|
||||
u16 reg_drop_m2;
|
||||
#endif
|
||||
#if (MACID_NUM_SW_LIMIT > 96)
|
||||
u16 reg_sleep_m3;
|
||||
u16 reg_drop_m3;
|
||||
#endif
|
||||
#endif
|
||||
u16 macid_txrpt;
|
||||
u8 macid_txrpt_pgsz;
|
||||
};
|
||||
|
||||
/* used for rf_ctl_t.rate_bmp_cck_ofdm */
|
||||
|
||||
@@ -120,6 +120,7 @@ enum h2c_cmd {
|
||||
H2C_CUSTOMER_STR_W1 = 0xC6,
|
||||
H2C_CUSTOMER_STR_W2 = 0xC7,
|
||||
H2C_CUSTOMER_STR_W3 = 0xC8,
|
||||
H2C_BT_UNKNOWN_DEVICE_WA = 0xD1,
|
||||
#ifdef DBG_FW_DEBUG_MSG_PKT
|
||||
H2C_FW_DBG_MSG_PKT = 0xE1,
|
||||
#endif /*DBG_FW_DEBUG_MSG_PKT*/
|
||||
@@ -185,6 +186,7 @@ enum h2c_cmd {
|
||||
#define H2C_BTC_WL_PORT_ID_LEN 1
|
||||
#endif
|
||||
|
||||
#define H2C_BT_UNKNOWN_DEVICE_WA_LEN 1
|
||||
#ifdef DBG_FW_DEBUG_MSG_PKT
|
||||
#define H2C_FW_DBG_MSG_PKT_LEN 2
|
||||
#endif /*DBG_FW_DEBUG_MSG_PKT*/
|
||||
@@ -566,6 +568,16 @@ s32 rtw_hal_customer_str_write(_adapter *adapter, const u8 *cs);
|
||||
#define SET_H2CCMD_LPSPG_IQK_INFO_LOC(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE((__pH2CCmd) + 3, 0, 8, __Value)/*Loc_IQK_result*/
|
||||
#endif
|
||||
|
||||
/* BT_UNKNOWN_DEVICE_WA_0xD1 */
|
||||
#define SET_H2CCMD_BT_UNKNOWN_DEVICE_WA_HANG_CHK_EN(__pH2CCmd, __Value) \
|
||||
SET_BITS_TO_LE_1BYTE(__pH2CCmd, 0, 1, __Value)
|
||||
#define SET_H2CCMD_BT_UNKNOWN_DEVICE_WA_FORCE_IB_EN(__pH2CCmd, __Value) \
|
||||
SET_BITS_TO_LE_1BYTE(__pH2CCmd, 1, 1, __Value)
|
||||
#define SET_H2CCMD_BT_UNKNOWN_DEVICE_WA_HWID_CHK_EN(__pH2CCmd, __Value) \
|
||||
SET_BITS_TO_LE_1BYTE(__pH2CCmd, 2, 1, __Value)
|
||||
#define SET_H2CCMD_BT_UNKNOWN_DEVICE_WA_ONE_TIME_CHK(__pH2CCmd, __Value) \
|
||||
SET_BITS_TO_LE_1BYTE(__pH2CCmd, 3, 1, __Value)
|
||||
|
||||
#ifdef DBG_FW_DEBUG_MSG_PKT
|
||||
#define SET_H2CCMD_FW_DBG_MSG_PKT_EN(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE(__pH2CCmd, 0, 1, __Value)/*sniffer_dbg_en*/
|
||||
#define SET_H2CCMD_RSVDPAGE_LOC_FW_DBG_MSG_PKT(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE((__pH2CCmd)+1, 0, 8, __Value) /*loc_debug_packet*/
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
|
||||
/* 8188E PKT_BUFF_ACCESS_CTRL value */
|
||||
#define TXPKT_BUF_SELECT 0x69
|
||||
#define TXREPORT_BUF_SELECT 0x7F
|
||||
#define RXPKT_BUF_SELECT 0xA5
|
||||
#define DISABLE_TRXPKT_BUF_ACCESS 0x0
|
||||
|
||||
|
||||
@@ -224,6 +224,9 @@ struct hal_spec_t {
|
||||
|
||||
u8 sec_cam_ent_num;
|
||||
u8 sec_cap;
|
||||
u8 macid_cap;
|
||||
u16 macid_txrpt;
|
||||
u8 macid_txrpt_pgsz;
|
||||
|
||||
u8 rfpath_num_2g:4; /* used for tx power index path */
|
||||
u8 rfpath_num_5g:4; /* used for tx power index path */
|
||||
|
||||
@@ -841,6 +841,8 @@ s32 rtw_hal_macid_sleep(_adapter *adapter, u8 macid);
|
||||
s32 rtw_hal_macid_wakeup(_adapter *adapter, u8 macid);
|
||||
s32 rtw_hal_macid_sleep_all_used(_adapter *adapter);
|
||||
s32 rtw_hal_macid_wakeup_all_used(_adapter *adapter);
|
||||
s32 rtw_hal_macid_drop(_adapter *adapter, u8 macid);
|
||||
s32 rtw_hal_macid_undrop(_adapter *adapter, u8 macid);
|
||||
|
||||
s32 rtw_hal_fill_h2c_cmd(PADAPTER padapter, u8 ElementID, u32 CmdLen, u8 *pCmdBuffer);
|
||||
void rtw_hal_fill_fake_txdesc(_adapter *padapter, u8 *pDesc, u32 BufferLen,
|
||||
|
||||
@@ -351,13 +351,13 @@ __inline static _list *get_list_head(_queue *queue)
|
||||
return &(queue->queue);
|
||||
}
|
||||
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0))
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0))
|
||||
static inline void timer_hdl(struct timer_list *in_timer)
|
||||
#else
|
||||
static inline void timer_hdl(unsigned long cntx)
|
||||
#endif
|
||||
{
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0))
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0))
|
||||
_timer *ptimer = from_timer(ptimer, in_timer, timer);
|
||||
#else
|
||||
_timer *ptimer = (_timer *)cntx;
|
||||
@@ -370,7 +370,7 @@ __inline static void _init_timer(_timer *ptimer, _nic_hdl nic_hdl, void *pfunc,
|
||||
ptimer->function = pfunc;
|
||||
ptimer->arg = cntx;
|
||||
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0))
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0))
|
||||
timer_setup(&ptimer->timer, timer_hdl, 0);
|
||||
#else
|
||||
/* setup_timer(ptimer, pfunc,(u32)cntx); */
|
||||
|
||||
@@ -842,6 +842,7 @@ u8 rtw_get_sec_camid(_adapter *adapter, u8 max_bk_key_num, u8 *sec_key_id);
|
||||
|
||||
struct macid_bmp;
|
||||
struct macid_ctl_t;
|
||||
bool _rtw_macid_ctl_chk_cap(_adapter *adapter, u8 cap);
|
||||
void dump_macid_map(void *sel, struct macid_bmp *map, u8 max_num);
|
||||
bool rtw_macid_is_set(struct macid_bmp *map, u8 id);
|
||||
void rtw_macid_map_clr(struct macid_bmp *map, u8 id);
|
||||
@@ -861,8 +862,10 @@ void rtw_macid_ctl_set_rate_bmp0(struct macid_ctl_t *macid_ctl, u8 id, u32 bmp);
|
||||
void rtw_macid_ctl_set_rate_bmp1(struct macid_ctl_t *macid_ctl, u8 id, u32 bmp);
|
||||
#ifdef CONFIG_PROTSEL_MACSLEEP
|
||||
void rtw_macid_ctl_init_sleep_reg(struct macid_ctl_t *macid_ctl, u16 reg_ctrl, u16 reg_info);
|
||||
void rtw_macid_ctl_init_drop_reg(struct macid_ctl_t *macid_ctl, u16 reg_ctrl, u16 reg_info);
|
||||
#else
|
||||
void rtw_macid_ctl_init_sleep_reg(struct macid_ctl_t *macid_ctl, u16 m0, u16 m1, u16 m2, u16 m3);
|
||||
void rtw_macid_ctl_init_drop_reg(struct macid_ctl_t *macid_ctl, u16 m0, u16 m1, u16 m2, u16 m3);
|
||||
#endif
|
||||
void rtw_macid_ctl_init(struct macid_ctl_t *macid_ctl);
|
||||
void rtw_macid_ctl_deinit(struct macid_ctl_t *macid_ctl);
|
||||
|
||||
@@ -251,7 +251,7 @@ struct security_priv {
|
||||
#define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
|
||||
#endif
|
||||
|
||||
struct rtw_sha256_state {
|
||||
struct _sha256_state {
|
||||
u64 length;
|
||||
u32 state[8], curlen;
|
||||
u8 buf[64];
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
#define DRIVERVERSION "v5.8.7.2_36899.20200819_COEX20191120-7777"
|
||||
#define DRIVERVERSION "v5.8.7.4_37264.20200922_COEX20191120-7777"
|
||||
#define BTCOEXVERSION "COEX20191120-7777"
|
||||
|
||||
@@ -68,7 +68,8 @@ struct xmit_frame;
|
||||
struct xmit_buf;
|
||||
|
||||
extern int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev);
|
||||
extern int rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev);
|
||||
extern inline netdev_tx_t rtw_xmit_entry(struct sk_buff *pkt,
|
||||
struct net_device *pnetdev);
|
||||
|
||||
#endif /* PLATFORM_LINUX */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user