skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-13 00:32:24 +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
Show stats 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
#endif #endif
#ifdef CONFIG_BR_EXT
/* define BR_EXT_DEBUG */
#define NAT25_IPV4 01 #define NAT25_IPV4 01
#define NAT25_IPV6 02 #define NAT25_IPV6 02
#define NAT25_IPX 03 #define NAT25_IPX 03
@ -1657,5 +1653,3 @@ void *scdb_findEntry(_adapter *priv, unsigned char *macAddr,
/* _exit_critical_bh(&priv->br_ext_lock, &irqL); */ /* _exit_critical_bh(&priv->br_ext_lock, &irqL); */
return NULL; return NULL;
} }
#endif /* CONFIG_BR_EXT */

10
core/rtw_cmd.c
View file

@ -25,9 +25,7 @@
#include <recv_osdep.h> #include <recv_osdep.h>
#include <cmd_osdep.h> #include <cmd_osdep.h>
#include <mlme_osdep.h> #include <mlme_osdep.h>
#ifdef CONFIG_BR_EXT
#include <rtw_br_ext.h> #include <rtw_br_ext.h>
#endif /* CONFIG_BR_EXT */
#include <rtw_mlme_ext.h> #include <rtw_mlme_ext.h>
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
@ -2610,8 +2608,7 @@ void rtw_disassoc_cmd_callback(_adapter* padapter, struct cmd_obj *pcmd)
_func_enter_; _func_enter_;
if (pcmd->res != H2C_SUCCESS) if (pcmd->res != H2C_SUCCESS) {
{
_enter_critical_bh(&pmlmepriv->lock, &irqL); _enter_critical_bh(&pmlmepriv->lock, &irqL);
set_fwstate(pmlmepriv, _FW_LINKED); set_fwstate(pmlmepriv, _FW_LINKED);
_exit_critical_bh(&pmlmepriv->lock, &irqL); _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.")); RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("\n ***Error: disconnect_cmd_callback Fail ***\n."));
goto exit; goto exit;
} } else /* clear bridge database */
#ifdef CONFIG_BR_EXT
else /* clear bridge database */
nat25_db_cleanup(padapter); nat25_db_cleanup(padapter);
#endif /* CONFIG_BR_EXT */
/* free cmd */ /* free cmd */
rtw_free_cmd_obj(pcmd); 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
#endif /* CONFIG_ACTIVE_KEEP_ALIVE_CHECK */ #endif /* CONFIG_ACTIVE_KEEP_ALIVE_CHECK */
#ifdef CONFIG_BR_EXT
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35))
rcu_read_lock(); rcu_read_lock();
#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) */ #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)) #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35))
rcu_read_unlock(); rcu_read_unlock();
#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) */ #endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) */
#endif /* CONFIG_BR_EXT */
} }
#ifdef CONFIG_SET_SCAN_DENY_TIMER #ifdef CONFIG_SET_SCAN_DENY_TIMER
inline bool rtw_is_scan_deny(_adapter *adapter) 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 */ /* Indicat the packets to upper layer */
if (sub_skb) { if (sub_skb) {
/* memset(sub_skb->cb, 0, sizeof(sub_skb->cb)); */
#ifdef CONFIG_BR_EXT
/* Insert NAT2.5 RX here! */ /* Insert NAT2.5 RX here! */
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -2257,7 +2254,6 @@ static int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe)
rcu_read_unlock(); rcu_read_unlock();
#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) */ #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->protocol = eth_type_trans(sub_skb, padapter->pnetdev);
sub_skb->dev = padapter->pnetdev; sub_skb->dev = padapter->pnetdev;

9
core/rtw_xmit.c
View file

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

3
include/autoconf.h
View file

@ -101,10 +101,7 @@
#define RTW_NOTCH_FILTER 0 /* 0:Disable, 1:Enable, */ #define RTW_NOTCH_FILTER 0 /* 0:Disable, 1:Enable, */
#define CONFIG_BR_EXT // Enable NAT2.5 support for STA mode interface with a L2 Bridge
#ifdef CONFIG_BR_EXT
#define CONFIG_BR_EXT_BRNAME "br0" #define CONFIG_BR_EXT_BRNAME "br0"
#endif // CONFIG_BR_EXT
/* /*
* Interface Related Config * Interface Related Config

7
include/drv_types.h
View file

@ -77,10 +77,7 @@ typedef struct _ADAPTER _adapter, ADAPTER,*PADAPTER;
#include <rtw_mp.h> #include <rtw_mp.h>
#endif #endif
#ifdef CONFIG_BR_EXT
#include <rtw_br_ext.h> #include <rtw_br_ext.h>
#endif // CONFIG_BR_EXT
#ifdef CONFIG_IOCTL_CFG80211 #ifdef CONFIG_IOCTL_CFG80211
#include "ioctl_cfg80211.h" #include "ioctl_cfg80211.h"
#endif //CONFIG_IOCTL_CFG80211 #endif //CONFIG_IOCTL_CFG80211
@ -421,9 +418,7 @@ struct _ADAPTER{
_mutex *hw_init_mutex; _mutex *hw_init_mutex;
#ifdef CONFIG_BR_EXT
_lock br_ext_lock; _lock br_ext_lock;
//unsigned int macclone_completed;
struct nat25_network_db_entry *nethash[NAT25_HASH_SIZE]; struct nat25_network_db_entry *nethash[NAT25_HASH_SIZE];
int pppoe_connection_in_progress; int pppoe_connection_in_progress;
unsigned char pppoe_addr[MACADDRLEN]; unsigned char pppoe_addr[MACADDRLEN];
@ -432,9 +427,7 @@ struct _ADAPTER{
struct nat25_network_db_entry *scdb_entry; struct nat25_network_db_entry *scdb_entry;
unsigned char br_mac[MACADDRLEN]; unsigned char br_mac[MACADDRLEN];
unsigned char br_ip[4]; unsigned char br_ip[4];
struct br_ext_info ethBrExtInfo; struct br_ext_info ethBrExtInfo;
#endif // CONFIG_BR_EXT
#ifdef CONFIG_MAC_LOOPBACK_DRIVER #ifdef CONFIG_MAC_LOOPBACK_DRIVER
PLOOPBACKDATA ploopback; PLOOPBACKDATA ploopback;

13
os_dep/os_intfs.c
View file

@ -31,10 +31,7 @@
#include <usb_osintf.h> #include <usb_osintf.h>
#include <usb_hal.h> #include <usb_hal.h>
#ifdef CONFIG_BR_EXT
#include <rtw_br_ext.h> #include <rtw_br_ext.h>
#endif //CONFIG_BR_EXT
#ifdef CONFIG_RF_GAIN_OFFSET #ifdef CONFIG_RF_GAIN_OFFSET
#define REG_RF_BB_GAIN_OFFSET 0x55 #define REG_RF_BB_GAIN_OFFSET 0x55
@ -1203,9 +1200,7 @@ _func_enter_;
rtw_hal_sreset_init(padapter); rtw_hal_sreset_init(padapter);
#endif #endif
#ifdef CONFIG_BR_EXT
_rtw_spinlock_init(&padapter->br_ext_lock); _rtw_spinlock_init(&padapter->br_ext_lock);
#endif // CONFIG_BR_EXT
exit: exit:
RT_TRACE(_module_os_intfs_c_,_drv_info_,("-rtw_init_drv_sw\n")); RT_TRACE(_module_os_intfs_c_,_drv_info_,("-rtw_init_drv_sw\n"));
@ -1284,9 +1279,7 @@ u8 rtw_free_drv_sw(_adapter *padapter)
#endif #endif
#ifdef CONFIG_BR_EXT
_rtw_spinlock_free(&padapter->br_ext_lock); _rtw_spinlock_free(&padapter->br_ext_lock);
#endif // CONFIG_BR_EXT
free_mlme_ext_priv(&padapter->mlmeextpriv); free_mlme_ext_priv(&padapter->mlmeextpriv);
@ -1331,7 +1324,6 @@ u8 rtw_free_drv_sw(_adapter *padapter)
return _SUCCESS; return _SUCCESS;
} }
#ifdef CONFIG_BR_EXT
void netdev_br_init(struct net_device *netdev) void netdev_br_init(struct net_device *netdev)
{ {
_adapter *adapter = (_adapter *)rtw_netdev_priv(netdev); _adapter *adapter = (_adapter *)rtw_netdev_priv(netdev);
@ -1376,7 +1368,6 @@ void netdev_br_init(struct net_device *netdev)
rcu_read_unlock(); rcu_read_unlock();
#endif // (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) #endif // (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35))
} }
#endif //CONFIG_BR_EXT
int _netdev_open(struct net_device *pnetdev) int _netdev_open(struct net_device *pnetdev)
{ {
@ -1447,9 +1438,7 @@ int _netdev_open(struct net_device *pnetdev)
else else
rtw_netif_wake_queue(pnetdev); rtw_netif_wake_queue(pnetdev);
#ifdef CONFIG_BR_EXT
netdev_br_init(pnetdev); netdev_br_init(pnetdev);
#endif // CONFIG_BR_EXT
netdev_open_normal_process: netdev_open_normal_process:
@ -1631,9 +1620,7 @@ static int netdev_close(struct net_device *pnetdev)
rtw_led_control(padapter, LED_CTL_POWER_OFF); rtw_led_control(padapter, LED_CTL_POWER_OFF);
} }
#ifdef CONFIG_BR_EXT
nat25_db_cleanup(padapter); nat25_db_cleanup(padapter);
#endif // CONFIG_BR_EXT
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
#ifdef CONFIG_IOCTL_CFG80211 #ifdef CONFIG_IOCTL_CFG80211

23
os_dep/recv_linux.c
View file

@ -172,10 +172,7 @@ int rtw_recv_indicatepkt(_adapter *padapter, union recv_frame *precv_frame)
_queue *pfree_recv_queue; _queue *pfree_recv_queue;
_pkt *skb; _pkt *skb;
struct mlme_priv*pmlmepriv = &padapter->mlmepriv; struct mlme_priv*pmlmepriv = &padapter->mlmepriv;
#ifdef CONFIG_BR_EXT
void *br_port = NULL; void *br_port = NULL;
#endif
_func_enter_; _func_enter_;
@ -254,9 +251,6 @@ _func_enter_;
} }
} }
#ifdef CONFIG_BR_EXT
#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
br_port = padapter->pnetdev->br_port; br_port = padapter->pnetdev->br_port;
#else // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) #else // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
@ -265,23 +259,6 @@ _func_enter_;
rcu_read_unlock(); rcu_read_unlock();
#endif // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35)) #endif // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
if ( br_port && (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == true) )
{
if (nat25_handle_frame(padapter, skb) == -1) {
//priv->ext_stats.rx_data_drops++;
//DEBUG_ERR("RX DROP: nat25_handle_frame fail!\n");
//return FAIL;
#if 1
// bypass this frame to upper layer!!
#else
goto _recv_indicatepkt_drop;
#endif
}
}
#endif // CONFIG_BR_EXT
skb->ip_summed = CHECKSUM_NONE; skb->ip_summed = CHECKSUM_NONE;
skb->dev = padapter->pnetdev; skb->dev = padapter->pnetdev;
skb->protocol = eth_type_trans(skb, padapter->pnetdev); skb->protocol = eth_type_trans(skb, padapter->pnetdev);