skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-05-08 22:43:04 +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

13
os_dep/os_intfs.c
View file

@ -31,10 +31,7 @@
#include <usb_osintf.h>
#include <usb_hal.h>
#ifdef CONFIG_BR_EXT
#include <rtw_br_ext.h>
#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

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;
_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);