diff --git a/core/rtw_br_ext.c b/core/rtw_br_ext.c index b674016..96d195e 100644 --- a/core/rtw_br_ext.c +++ b/core/rtw_br_ext.c @@ -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 */ diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c index 1e04ff2..983304c 100644 --- a/core/rtw_cmd.c +++ b/core/rtw_cmd.c @@ -25,9 +25,7 @@ #include #include #include -#ifdef CONFIG_BR_EXT #include -#endif /* CONFIG_BR_EXT */ #include #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); diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c index 211a5c8..be776ee 100644 --- a/core/rtw_mlme.c +++ b/core/rtw_mlme.c @@ -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) { diff --git a/core/rtw_recv.c b/core/rtw_recv.c index 4df01f9..c8366c2 100644 --- a/core/rtw_recv.c +++ b/core/rtw_recv.c @@ -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; diff --git a/core/rtw_xmit.c b/core/rtw_xmit.c index 72ca530..9db3811 100644 --- a/core/rtw_xmit.c +++ b/core/rtw_xmit.c @@ -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) { diff --git a/include/autoconf.h b/include/autoconf.h index c39aa6d..66e9146 100644 --- a/include/autoconf.h +++ b/include/autoconf.h @@ -101,10 +101,7 @@ #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" -#endif // CONFIG_BR_EXT /* * Interface Related Config diff --git a/include/drv_types.h b/include/drv_types.h index 7e01f2b..e4678fa 100644 --- a/include/drv_types.h +++ b/include/drv_types.h @@ -77,10 +77,7 @@ typedef struct _ADAPTER _adapter, ADAPTER,*PADAPTER; #include #endif -#ifdef CONFIG_BR_EXT #include -#endif // CONFIG_BR_EXT - #ifdef CONFIG_IOCTL_CFG80211 #include "ioctl_cfg80211.h" #endif //CONFIG_IOCTL_CFG80211 @@ -421,9 +418,7 @@ struct _ADAPTER{ _mutex *hw_init_mutex; -#ifdef CONFIG_BR_EXT _lock br_ext_lock; - //unsigned int macclone_completed; struct nat25_network_db_entry *nethash[NAT25_HASH_SIZE]; int pppoe_connection_in_progress; unsigned char pppoe_addr[MACADDRLEN]; @@ -432,9 +427,7 @@ struct _ADAPTER{ struct nat25_network_db_entry *scdb_entry; unsigned char br_mac[MACADDRLEN]; unsigned char br_ip[4]; - struct br_ext_info ethBrExtInfo; -#endif // CONFIG_BR_EXT #ifdef CONFIG_MAC_LOOPBACK_DRIVER PLOOPBACKDATA ploopback; diff --git a/os_dep/os_intfs.c b/os_dep/os_intfs.c index 7546a96..f58e767 100644 --- a/os_dep/os_intfs.c +++ b/os_dep/os_intfs.c @@ -31,10 +31,7 @@ #include #include - -#ifdef CONFIG_BR_EXT #include -#endif //CONFIG_BR_EXT #ifdef CONFIG_RF_GAIN_OFFSET #define REG_RF_BB_GAIN_OFFSET 0x55 @@ -1203,9 +1200,7 @@ _func_enter_; rtw_hal_sreset_init(padapter); #endif -#ifdef CONFIG_BR_EXT _rtw_spinlock_init(&padapter->br_ext_lock); -#endif // CONFIG_BR_EXT exit: 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 -#ifdef CONFIG_BR_EXT _rtw_spinlock_free(&padapter->br_ext_lock); -#endif // CONFIG_BR_EXT free_mlme_ext_priv(&padapter->mlmeextpriv); @@ -1331,7 +1324,6 @@ u8 rtw_free_drv_sw(_adapter *padapter) return _SUCCESS; } -#ifdef CONFIG_BR_EXT void netdev_br_init(struct net_device *netdev) { _adapter *adapter = (_adapter *)rtw_netdev_priv(netdev); @@ -1376,7 +1368,6 @@ void netdev_br_init(struct net_device *netdev) rcu_read_unlock(); #endif // (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) } -#endif //CONFIG_BR_EXT int _netdev_open(struct net_device *pnetdev) { @@ -1447,9 +1438,7 @@ int _netdev_open(struct net_device *pnetdev) else rtw_netif_wake_queue(pnetdev); -#ifdef CONFIG_BR_EXT netdev_br_init(pnetdev); -#endif // CONFIG_BR_EXT netdev_open_normal_process: @@ -1631,9 +1620,7 @@ static int netdev_close(struct net_device *pnetdev) rtw_led_control(padapter, LED_CTL_POWER_OFF); } -#ifdef CONFIG_BR_EXT nat25_db_cleanup(padapter); -#endif // CONFIG_BR_EXT #ifdef CONFIG_P2P #ifdef CONFIG_IOCTL_CFG80211 diff --git a/os_dep/recv_linux.c b/os_dep/recv_linux.c index 1e3ffc3..61f32c4 100644 --- a/os_dep/recv_linux.c +++ b/os_dep/recv_linux.c @@ -172,10 +172,7 @@ int rtw_recv_indicatepkt(_adapter *padapter, union recv_frame *precv_frame) _queue *pfree_recv_queue; _pkt *skb; struct mlme_priv*pmlmepriv = &padapter->mlmepriv; - -#ifdef CONFIG_BR_EXT void *br_port = NULL; -#endif _func_enter_; @@ -254,9 +251,6 @@ _func_enter_; } } - -#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)) @@ -265,23 +259,6 @@ _func_enter_; rcu_read_unlock(); #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->dev = padapter->pnetdev; skb->protocol = eth_type_trans(skb, padapter->pnetdev);