mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2024-11-09 23:19:39 +00:00
rtl8188eu: Remove CONFIG_TX_EARLY_MODE - not defined
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
parent
0bf3328b82
commit
74b9d2f728
5 changed files with 10 additions and 88 deletions
|
@ -1324,14 +1324,6 @@ odm_DIG(
|
|||
u1Byte dm_dig_max, dm_dig_min;
|
||||
u1Byte CurrentIGI = pDM_DigTable->CurIGValue;
|
||||
|
||||
#ifdef CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV
|
||||
if ((pDM_Odm->bLinked) && (pDM_Odm->Adapter->registrypriv.force_igi !=0))
|
||||
{
|
||||
printk("pDM_Odm->RSSI_Min=%d\n",pDM_Odm->RSSI_Min);
|
||||
ODM_Write_DIG(pDM_Odm,pDM_Odm->Adapter->registrypriv.force_igi);
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
ODM_RT_TRACE(pDM_Odm,ODM_COMP_DIG, ODM_DBG_LOUD, ("odm_DIG()==>\n"));
|
||||
if ((!(pDM_Odm->SupportAbility&ODM_BB_DIG)) ||(!(pDM_Odm->SupportAbility&ODM_BB_FA_CNT)))
|
||||
{
|
||||
|
|
|
@ -439,38 +439,6 @@ ODM_AntennaDiversity_88E(
|
|||
pFAT_T pDM_FatTable = &pDM_Odm->DM_FatTable;
|
||||
if ((pDM_Odm->SupportICType != ODM_RTL8188E) || (!(pDM_Odm->SupportAbility & ODM_BB_ANT_DIV)))
|
||||
return;
|
||||
#ifdef CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV
|
||||
if (pDM_Odm->bLinked){
|
||||
if (pDM_Odm->Adapter->registrypriv.force_ant != 0)
|
||||
{
|
||||
u4Byte Main_RSSI, Aux_RSSI;
|
||||
u8 i=0;
|
||||
Main_RSSI = (pDM_FatTable->MainAnt_Cnt[i]!=0)?(pDM_FatTable->MainAnt_Sum[i]/pDM_FatTable->MainAnt_Cnt[i]):0;
|
||||
Aux_RSSI = (pDM_FatTable->AuxAnt_Cnt[i]!=0)?(pDM_FatTable->AuxAnt_Sum[i]/pDM_FatTable->AuxAnt_Cnt[i]):0;
|
||||
|
||||
ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("MacID=%d, MainAnt_Sum=%d, MainAnt_Cnt=%d\n", i, pDM_FatTable->MainAnt_Sum[i], pDM_FatTable->MainAnt_Cnt[i]));
|
||||
ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("MacID=%d, AuxAnt_Sum=%d, AuxAnt_Cnt=%d\n",i, pDM_FatTable->AuxAnt_Sum[i], pDM_FatTable->AuxAnt_Cnt[i]));
|
||||
ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("MacID=%d, Main_RSSI= %d, Aux_RSSI= %d\n", i, Main_RSSI, Aux_RSSI));
|
||||
pDM_FatTable->MainAnt_Sum[i] = 0;
|
||||
pDM_FatTable->AuxAnt_Sum[i] = 0;
|
||||
pDM_FatTable->MainAnt_Cnt[i] = 0;
|
||||
pDM_FatTable->AuxAnt_Cnt[i] = 0;
|
||||
}
|
||||
if (pDM_Odm->Adapter->registrypriv.force_ant==1){
|
||||
ODM_UpdateRxIdleAnt_88E(pDM_Odm, MAIN_ANT);
|
||||
printk("%s fixed antenna in Main ant\n",__func__);
|
||||
return;
|
||||
}
|
||||
else if (pDM_Odm->Adapter->registrypriv.force_ant==2){
|
||||
ODM_UpdateRxIdleAnt_88E(pDM_Odm, AUX_ANT);
|
||||
printk("%s fixed antenna in AUX ant\n",__func__);
|
||||
return;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
if (!pDM_Odm->bLinked)
|
||||
{
|
||||
ODM_RT_TRACE(pDM_Odm,ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("ODM_AntennaDiversity_88E(): No Link.\n"));
|
||||
|
|
|
@ -121,9 +121,6 @@ struct registry_priv
|
|||
u8 mp_mode;
|
||||
u8 software_encrypt;
|
||||
u8 software_decrypt;
|
||||
#ifdef CONFIG_TX_EARLY_MODE
|
||||
u8 early_mode;
|
||||
#endif
|
||||
u8 acm_method;
|
||||
//UAPSD
|
||||
u8 wmm_enable;
|
||||
|
@ -180,12 +177,6 @@ struct registry_priv
|
|||
u8 if2name[16];
|
||||
|
||||
u8 notch_filter;
|
||||
|
||||
#ifdef CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV
|
||||
u8 force_ant;//0 normal,1 main,2 aux
|
||||
u8 force_igi;//0 normal
|
||||
#endif
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -79,33 +79,26 @@ do{\
|
|||
}while (0)
|
||||
|
||||
#define AES_IV(pattrib_iv, dot11txpn, keyidx)\
|
||||
do{\
|
||||
pattrib_iv[0] = dot11txpn._byte_.TSC0;\
|
||||
pattrib_iv[1] = dot11txpn._byte_.TSC1;\
|
||||
pattrib_iv[2] = 0;\
|
||||
pattrib_iv[3] = BIT(5) | ((keyidx & 0x3)<<6);\
|
||||
pattrib_iv[4] = dot11txpn._byte_.TSC2;\
|
||||
pattrib_iv[5] = dot11txpn._byte_.TSC3;\
|
||||
pattrib_iv[6] = dot11txpn._byte_.TSC4;\
|
||||
pattrib_iv[7] = dot11txpn._byte_.TSC5;\
|
||||
do { \
|
||||
pattrib_iv[0] = dot11txpn._byte_.TSC0; \
|
||||
pattrib_iv[1] = dot11txpn._byte_.TSC1; \
|
||||
pattrib_iv[2] = 0; \
|
||||
pattrib_iv[3] = BIT(5) | ((keyidx & 0x3)<<6); \
|
||||
pattrib_iv[4] = dot11txpn._byte_.TSC2; \
|
||||
pattrib_iv[5] = dot11txpn._byte_.TSC3; \
|
||||
pattrib_iv[6] = dot11txpn._byte_.TSC4; \
|
||||
pattrib_iv[7] = dot11txpn._byte_.TSC5; \
|
||||
dot11txpn.val = dot11txpn.val == 0xffffffffffffULL ? 0: (dot11txpn.val+1);\
|
||||
}while (0)
|
||||
|
||||
} while (0)
|
||||
|
||||
#define HWXMIT_ENTRY 4
|
||||
|
||||
|
||||
#define TXDESC_SIZE 32
|
||||
|
||||
#ifdef CONFIG_TX_EARLY_MODE
|
||||
#define EARLY_MODE_INFO_SIZE 8
|
||||
#endif
|
||||
|
||||
#define PACKET_OFFSET_SZ (8)
|
||||
#define TXDESC_OFFSET (TXDESC_SIZE + PACKET_OFFSET_SZ)
|
||||
|
||||
struct tx_desc{
|
||||
|
||||
//DWORD 0
|
||||
__le32 txdw0;
|
||||
__le32 txdw1;
|
||||
|
@ -124,11 +117,7 @@ union txdesc {
|
|||
};
|
||||
|
||||
struct hw_xmit {
|
||||
//_lock xmit_lock;
|
||||
//_list pending;
|
||||
_queue *sta_queue;
|
||||
//struct hw_txqueue *phwtxqueue;
|
||||
//sint txcmdcnt;
|
||||
int accnt;
|
||||
};
|
||||
|
||||
|
@ -379,13 +368,6 @@ struct xmit_priv {
|
|||
uint free_xmit_extbuf_cnt;
|
||||
|
||||
u16 nqos_ssn;
|
||||
#ifdef CONFIG_TX_EARLY_MODE
|
||||
|
||||
#define MAX_AGG_PKT_NUM 256 //Max tx ampdu coounts
|
||||
|
||||
struct agg_pkt_info agg_pkt[MAX_AGG_PKT_NUM];
|
||||
#endif
|
||||
|
||||
int ack_tx;
|
||||
_mutex ack_tx_mutex;
|
||||
struct submit_ctx ack_tx_ops;
|
||||
|
|
|
@ -144,13 +144,6 @@ int rtw_mc2u_disable = 0;
|
|||
static int rtw_80211d = 0;
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV
|
||||
int rtw_force_ant = 2;//0 :normal, 1:Main ant, 2:Aux ant
|
||||
int rtw_force_igi =0;//0 :normal
|
||||
module_param(rtw_force_ant, int, 0644);
|
||||
module_param(rtw_force_igi, int, 0644);
|
||||
#endif
|
||||
|
||||
static char* ifname = "wlan%d";
|
||||
module_param(ifname, charp, 0644);
|
||||
MODULE_PARM_DESC(ifname, "The default name to allocate for first interface");
|
||||
|
@ -707,10 +700,6 @@ _func_enter_;
|
|||
snprintf(registry_par->ifname, 16, "%s", ifname);
|
||||
snprintf(registry_par->if2name, 16, "%s", if2name);
|
||||
registry_par->notch_filter = (u8)rtw_notch_filter;
|
||||
#ifdef CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV
|
||||
registry_par->force_ant = (u8)rtw_force_ant;
|
||||
registry_par->force_igi = (u8)rtw_force_igi;
|
||||
#endif
|
||||
_func_exit_;
|
||||
return status;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue