skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-05-08 14:33:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: CONFIG_BR_EXT is always selected

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-18 10:42:52 -05:00
parent 07a90aac3f
commit baf9862596
9 changed files with 2 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/rtw_br_ext.c
View file

@ -47,10 +47,6 @@
#endif
#endif
#ifdef CONFIG_BR_EXT
/* define BR_EXT_DEBUG */
#define NAT25_IPV4 01
#define NAT25_IPV6 02
#define NAT25_IPX 03
@ -1657,5 +1653,3 @@ void *scdb_findEntry(_adapter *priv, unsigned char *macAddr,
/* _exit_critical_bh(&priv->br_ext_lock, &irqL); */
return NULL;
}
#endif /* CONFIG_BR_EXT */

10
core/rtw_cmd.c
View file

@ -25,9 +25,7 @@
#include <recv_osdep.h>
#include <cmd_osdep.h>
#include <mlme_osdep.h>
#ifdef CONFIG_BR_EXT
#include <rtw_br_ext.h>
#endif /* CONFIG_BR_EXT */
#include <rtw_mlme_ext.h>
#ifdef CONFIG_BT_COEXIST
@ -2610,8 +2608,7 @@ void rtw_disassoc_cmd_callback(_adapter* padapter, struct cmd_obj *pcmd)
_func_enter_;
if (pcmd->res != H2C_SUCCESS)
{
if (pcmd->res != H2C_SUCCESS) {
_enter_critical_bh(&pmlmepriv->lock, &irqL);
set_fwstate(pmlmepriv, _FW_LINKED);
_exit_critical_bh(&pmlmepriv->lock, &irqL);
@ -2619,11 +2616,8 @@ _func_enter_;
RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\n ***Error: disconnect_cmd_callback Fail ***\n."));
goto exit;
}
#ifdef CONFIG_BR_EXT
else /* clear bridge database */
} else /* clear bridge database */
nat25_db_cleanup(padapter);
#endif /* CONFIG_BR_EXT */
/* free cmd */
rtw_free_cmd_obj(pcmd);

6
core/rtw_mlme.c
View file

@ -2165,8 +2165,6 @@ void rtw_dynamic_check_timer_handlder(_adapter *adapter)
#endif
#endif /* CONFIG_ACTIVE_KEEP_ALIVE_CHECK */
#ifdef CONFIG_BR_EXT
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35))
rcu_read_lock();
#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) */
@ -2195,12 +2193,8 @@ void rtw_dynamic_check_timer_handlder(_adapter *adapter)
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35))
rcu_read_unlock();
#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) */
#endif /* CONFIG_BR_EXT */
}
#ifdef CONFIG_SET_SCAN_DENY_TIMER
inline bool rtw_is_scan_deny(_adapter *adapter)
{

4
core/rtw_recv.c
View file

@ -2246,9 +2246,6 @@ static int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe)
/* Indicat the packets to upper layer */
if (sub_skb) {
/* memset(sub_skb->cb, 0, sizeof(sub_skb->cb)); */
#ifdef CONFIG_BR_EXT
/* Insert NAT2.5 RX here! */
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -2257,7 +2254,6 @@ static int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe)
rcu_read_unlock();
#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) */
#endif /* CONFIG_BR_EXT */
sub_skb->protocol = eth_type_trans(sub_skb, padapter->pnetdev);
sub_skb->dev = padapter->pnetdev;

9
core/rtw_xmit.c
View file

@ -2171,7 +2171,6 @@ _func_enter_;
_func_exit_;
}
#ifdef CONFIG_BR_EXT
static int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb)
{
struct sk_buff *skb = *pskb;
@ -2316,7 +2315,6 @@ static int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb)
}
return 0;
}
#endif /* CONFIG_BR_EXT */
u32 rtw_get_ff_hwaddr(struct xmit_frame *pxmitframe)
{
@ -2383,11 +2381,8 @@ s32 rtw_xmit(_adapter *padapter, _pkt **ppkt)
#endif
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
struct xmit_frame *pxmitframe = NULL;
#ifdef CONFIG_BR_EXT
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
void *br_port = NULL;
#endif /* CONFIG_BR_EXT */
s32 res;
pxmitframe = rtw_alloc_xmitframe(pxmitpriv);
@ -2399,8 +2394,6 @@ s32 rtw_xmit(_adapter *padapter, _pkt **ppkt)
return -1;
}
#ifdef CONFIG_BR_EXT
#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
br_port = padapter->pnetdev->br_port;
#else /* (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) */
@ -2419,8 +2412,6 @@ s32 rtw_xmit(_adapter *padapter, _pkt **ppkt)
}
}
#endif /* CONFIG_BR_EXT */
res = update_attrib(padapter, *ppkt, &pxmitframe->attrib);
if (res == _FAIL) {