skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-26 14:23:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove CONFIG_TX_MCAST2UNI

Browse source 
This parameter is always selected.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-02-20 10:11:36 -06:00
parent 0f3cbc1f0f
commit 49437ec417
9 changed files with 0 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/rtw_ap.c
View file

@ -416,15 +416,12 @@ void expire_timeout_chk(struct adapter *padapter)
if (chk_sta_is_alive(psta) || !psta->expire_to) { if (chk_sta_is_alive(psta) || !psta->expire_to) {
psta->expire_to = pstapriv->expire_to; psta->expire_to = pstapriv->expire_to;
psta->keep_alive_trycnt = 0; psta->keep_alive_trycnt = 0;
#ifdef CONFIG_TX_MCAST2UNI
psta->under_exist_checking = 0; psta->under_exist_checking = 0;
#endif /* CONFIG_TX_MCAST2UNI */
} else { } else {
psta->expire_to--; psta->expire_to--;
} }
#ifndef CONFIG_ACTIVE_KEEP_ALIVE_CHECK #ifndef CONFIG_ACTIVE_KEEP_ALIVE_CHECK
#ifdef CONFIG_TX_MCAST2UNI
#ifdef CONFIG_80211N_HT #ifdef CONFIG_80211N_HT
if ( (psta->flags & WLAN_STA_HT) && (psta->htpriv.agg_enable_bitmap || psta->under_exist_checking) ) { if ( (psta->flags & WLAN_STA_HT) && (psta->htpriv.agg_enable_bitmap || psta->under_exist_checking) ) {
/* check sta by delba(addba) for 11n STA */ /* check sta by delba(addba) for 11n STA */
@ -445,7 +442,6 @@ void expire_timeout_chk(struct adapter *padapter)
} }
} }
#endif /* CONFIG_80211N_HT */ #endif /* CONFIG_80211N_HT */
#endif /* CONFIG_TX_MCAST2UNI */
#endif /* CONFIG_ACTIVE_KEEP_ALIVE_CHECK */ #endif /* CONFIG_ACTIVE_KEEP_ALIVE_CHECK */
if (psta->expire_to <= 0) if (psta->expire_to <= 0)

4
core/rtw_sta_mgt.c
View file

@ -72,9 +72,7 @@ void _rtw_init_stainfo(struct sta_info *psta)
psta->no_ht_set = 0; psta->no_ht_set = 0;
psta->ht_20mhz_set = 0; psta->ht_20mhz_set = 0;
#ifdef CONFIG_TX_MCAST2UNI
psta->under_exist_checking = 0; psta->under_exist_checking = 0;
#endif /* CONFIG_TX_MCAST2UNI */
psta->keep_alive_trycnt = 0; psta->keep_alive_trycnt = 0;
@ -588,9 +586,7 @@ u32 rtw_free_stainfo(struct adapter *padapter , struct sta_info *psta)
psta->aid = 0; psta->aid = 0;
} }
#ifdef CONFIG_TX_MCAST2UNI
psta->under_exist_checking = 0; psta->under_exist_checking = 0;
#endif /* CONFIG_TX_MCAST2UNI */
#endif /* CONFIG_AP_MODE */ #endif /* CONFIG_AP_MODE */

9
hal/usb_halinit.c
View file

@ -1570,22 +1570,13 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_MISC02);
rtw_write32(Adapter,REG_MACID_NO_LINK_0,0xFFFFFFFF); rtw_write32(Adapter,REG_MACID_NO_LINK_0,0xFFFFFFFF);
rtw_write32(Adapter,REG_MACID_NO_LINK_1,0xFFFFFFFF); rtw_write32(Adapter,REG_MACID_NO_LINK_1,0xFFFFFFFF);
#if defined(CONFIG_TX_MCAST2UNI)
#ifdef CONFIG_CHECK_AC_LIFETIME #ifdef CONFIG_CHECK_AC_LIFETIME
/* Enable lifetime check for the four ACs */ /* Enable lifetime check for the four ACs */
rtw_write8(Adapter, REG_LIFETIME_EN, 0x0F); rtw_write8(Adapter, REG_LIFETIME_EN, 0x0F);
#endif /* CONFIG_CHECK_AC_LIFETIME */ #endif /* CONFIG_CHECK_AC_LIFETIME */
#ifdef CONFIG_TX_MCAST2UNI
rtw_write16(Adapter, REG_PKT_VO_VI_LIFE_TIME, 0x0400); /* unit: 256us. 256ms */ rtw_write16(Adapter, REG_PKT_VO_VI_LIFE_TIME, 0x0400); /* unit: 256us. 256ms */
rtw_write16(Adapter, REG_PKT_BE_BK_LIFE_TIME, 0x0400); /* unit: 256us. 256ms */ rtw_write16(Adapter, REG_PKT_BE_BK_LIFE_TIME, 0x0400); /* unit: 256us. 256ms */
#else /* CONFIG_TX_MCAST2UNI */
rtw_write16(Adapter, REG_PKT_VO_VI_LIFE_TIME, 0x3000); /* unit: 256us. 3s */
rtw_write16(Adapter, REG_PKT_BE_BK_LIFE_TIME, 0x3000); /* unit: 256us. 3s */
#endif /* CONFIG_TX_MCAST2UNI */
#endif /* CONFIG_TX_MCAST2UNI */
#ifdef CONFIG_LED #ifdef CONFIG_LED
_InitHWLed(Adapter); _InitHWLed(Adapter);

3
include/autoconf.h
View file

@ -159,9 +159,6 @@
#define CONFIG_BR_EXT_BRNAME "br0" #define CONFIG_BR_EXT_BRNAME "br0"
#endif // CONFIG_BR_EXT #endif // CONFIG_BR_EXT
#define CONFIG_TX_MCAST2UNI // Support IP multicast->unicast
//#define CONFIG_CHECK_AC_LIFETIME // Check packet lifetime of 4 ACs.
/* /*
* Interface Related Config * Interface Related Config
*/ */

2
include/osdep_service.h
View file

@ -83,9 +83,7 @@
#include <linux/usb/ch9.h> #include <linux/usb/ch9.h>
#endif #endif
#ifdef CONFIG_TX_MCAST2UNI
extern int rtw_mc2u_disable; extern int rtw_mc2u_disable;
#endif // CONFIG_TX_MCAST2UNI
extern char* rtw_initmac; extern char* rtw_initmac;

2
include/sta_info.h
View file

@ -249,9 +249,7 @@ struct sta_info {
u8 dev_name[32]; u8 dev_name[32];
#endif //CONFIG_P2P #endif //CONFIG_P2P
#ifdef CONFIG_TX_MCAST2UNI
u8 under_exist_checking; u8 under_exist_checking;
#endif // CONFIG_TX_MCAST2UNI
u8 keep_alive_trycnt; u8 keep_alive_trycnt;

2
include/wifi.h
View file

@ -1074,10 +1074,8 @@ enum P2P_PS_MODE {
#define WFD_DEVINFO_PC_TDLS 0x0080 #define WFD_DEVINFO_PC_TDLS 0x0080
#define WFD_DEVINFO_HDCP_SUPPORT 0x0100 #define WFD_DEVINFO_HDCP_SUPPORT 0x0100
#ifdef CONFIG_TX_MCAST2UNI
#define IP_MCAST_MAC(mac) ((mac[0]==0x01)&&(mac[1]==0x00)&&(mac[2]==0x5e)) #define IP_MCAST_MAC(mac) ((mac[0]==0x01)&&(mac[1]==0x00)&&(mac[2]==0x5e))
#define ICMPV6_MCAST_MAC(mac) ((mac[0]==0x33)&&(mac[1]==0x33)&&(mac[2]!=0xff)) #define ICMPV6_MCAST_MAC(mac) ((mac[0]==0x33)&&(mac[1]==0x33)&&(mac[2]!=0xff))
#endif // CONFIG_TX_MCAST2UNI
#ifdef CONFIG_WAPI_SUPPORT #ifdef CONFIG_WAPI_SUPPORT
#ifndef IW_AUTH_WAPI_VERSION_1 #ifndef IW_AUTH_WAPI_VERSION_1

4
os_dep/os_intfs.c
View file

@ -158,9 +158,7 @@ static int rtw_hwpwrp_detect = 0; /* HW power ping detect 0:disable , 1:enable
static int rtw_hw_wps_pbc = 1; static int rtw_hw_wps_pbc = 1;
#ifdef CONFIG_TX_MCAST2UNI
int rtw_mc2u_disable = 0; int rtw_mc2u_disable = 0;
#endif /* CONFIG_TX_MCAST2UNI */
#ifdef CONFIG_80211D #ifdef CONFIG_80211D
static int rtw_80211d = 0; static int rtw_80211d = 0;
@ -262,9 +260,7 @@ module_param(rtw_fw_file_path, charp, 0644);
MODULE_PARM_DESC(rtw_fw_file_path, "The path of fw image"); MODULE_PARM_DESC(rtw_fw_file_path, "The path of fw image");
#endif /* CONFIG_FILE_FWIMG */ #endif /* CONFIG_FILE_FWIMG */
#ifdef CONFIG_TX_MCAST2UNI
module_param(rtw_mc2u_disable, int, 0644); module_param(rtw_mc2u_disable, int, 0644);
#endif /* CONFIG_TX_MCAST2UNI */
#ifdef CONFIG_80211D #ifdef CONFIG_80211D
module_param(rtw_80211d, int, 0644); module_param(rtw_80211d, int, 0644);

10
os_dep/xmit_linux.c
View file

@ -270,7 +270,6 @@ static void rtw_check_xmit_resource(struct adapter *padapter, _pkt *pkt)
#endif #endif
} }
#ifdef CONFIG_TX_MCAST2UNI
static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb) static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb)
{ {
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
@ -338,16 +337,12 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb)
rtw_skb_free(skb); rtw_skb_free(skb);
return true; return true;
} }
#endif /* CONFIG_TX_MCAST2UNI */
int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev) int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev); struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
#ifdef CONFIG_TX_MCAST2UNI
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
#endif /* CONFIG_TX_MCAST2UNI */
s32 res = 0; s32 res = 0;
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35))
u16 queue; u16 queue;
@ -367,7 +362,6 @@ int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev)
rtw_check_xmit_resource(padapter, pkt); rtw_check_xmit_resource(padapter, pkt);
#ifdef CONFIG_TX_MCAST2UNI
if ( !rtw_mc2u_disable if ( !rtw_mc2u_disable
&& check_fwstate(pmlmepriv, WIFI_AP_STATE) == true && check_fwstate(pmlmepriv, WIFI_AP_STATE) == true
&& ( IP_MCAST_MAC(pkt->data) && ( IP_MCAST_MAC(pkt->data)
@ -380,12 +374,8 @@ int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev)
if (res == true) { if (res == true) {
goto exit; goto exit;
} }
} else {
/* DBG_871X("Stop M2U(%d, %d)! ", pxmitpriv->free_xmitframe_cnt, pxmitpriv->free_xmitbuf_cnt); */
/* DBG_871X("!m2u ); */
} }
} }
#endif /* CONFIG_TX_MCAST2UNI */
res = rtw_xmit(padapter, &pkt); res = rtw_xmit(padapter, &pkt);
if (res < 0) { if (res < 0) {