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: Change all "if(" to "if ("

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-08-15 13:02:34 -05:00
parent aa89a39a09
commit 6ead3e77dc
61 changed files with 3500 additions and 3500 deletions
Download patch file Download diff file Expand all files Collapse all files

372
os_dep/ioctl_cfg80211.c
View file

File diff suppressed because it is too large Load diff

500
os_dep/ioctl_linux.c
View file

File diff suppressed because it is too large Load diff

28
os_dep/mlme_linux.c
View file

@ -86,7 +86,7 @@ void rtw_os_indicate_connect(struct adapter *adapter)
rtw_indicate_wx_assoc_event(adapter);
netif_carrier_on(adapter->pnetdev);
if(adapter->pid[2] !=0)
if (adapter->pid[2] !=0)
rtw_signal_process(adapter->pid[2], SIGALRM);
}
@ -108,7 +108,7 @@ void rtw_reset_securitypriv( struct adapter *adapter )
spin_lock_bh(&adapter->security_key_mutex);
if(adapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X)/* 802.1x */
if (adapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X)/* 802.1x */
{
/* Added by Albert 2009/02/18 */
/* We have to backup the PMK information for WiFi PMK Caching test item. */
@ -142,7 +142,7 @@ void rtw_reset_securitypriv( struct adapter *adapter )
}
else /* reset values in securitypriv */
{
/* if(adapter->mlmepriv.fw_state & WIFI_STATION_STATE) */
/* if (adapter->mlmepriv.fw_state & WIFI_STATION_STATE) */
/* */
struct security_priv *psec_priv=&adapter->securitypriv;
@ -182,7 +182,7 @@ void rtw_report_sec_ie(struct adapter *adapter,u8 authmode,u8 *sec_ie)
RT_TRACE(_module_mlme_osdep_c_,_drv_info_,("+rtw_report_sec_ie, authmode=%d\n", authmode));
buff = NULL;
if(authmode==_WPA_IE_ID_) {
if (authmode==_WPA_IE_ID_) {
RT_TRACE(_module_mlme_osdep_c_,_drv_info_,("rtw_report_sec_ie, authmode=%d\n", authmode));
buff = rtw_malloc(IW_CUSTOM_MAX);
@ -208,7 +208,7 @@ void rtw_report_sec_ie(struct adapter *adapter,u8 authmode,u8 *sec_ie)
wrqu.data.length = (wrqu.data.length<IW_CUSTOM_MAX) ? wrqu.data.length:IW_CUSTOM_MAX;
if(buff)
if (buff)
rtw_mfree(buff, IW_CUSTOM_MAX);
}
}
@ -282,13 +282,13 @@ void rtw_indicate_sta_assoc_event(struct adapter *padapter, struct sta_info *pst
union iwreq_data wrqu;
struct sta_priv *pstapriv = &padapter->stapriv;
if(psta==NULL)
if (psta==NULL)
return;
if(psta->aid > NUM_STA)
if (psta->aid > NUM_STA)
return;
if(pstapriv->sta_aid[psta->aid - 1] != psta)
if (pstapriv->sta_aid[psta->aid - 1] != psta)
return;
@ -304,13 +304,13 @@ void rtw_indicate_sta_disassoc_event(struct adapter *padapter, struct sta_info *
union iwreq_data wrqu;
struct sta_priv *pstapriv = &padapter->stapriv;
if(psta==NULL)
if (psta==NULL)
return;
if(psta->aid > NUM_STA)
if (psta->aid > NUM_STA)
return;
if(pstapriv->sta_aid[psta->aid - 1] != psta)
if (pstapriv->sta_aid[psta->aid - 1] != psta)
return;
@ -342,7 +342,7 @@ static int mgnt_netdev_open(struct net_device *pnetdev)
init_usb_anchor(&phostapdpriv->anchored);
if(!rtw_netif_queue_stopped(pnetdev))
if (!rtw_netif_queue_stopped(pnetdev))
rtw_netif_start_queue(pnetdev);
else
rtw_netif_wake_queue(pnetdev);
@ -419,7 +419,7 @@ int hostapd_mode_init(struct adapter *padapter)
pnetdev->watchdog_timeo = HZ; /* 1 second timeout */
if(dev_alloc_name(pnetdev,"mgnt.wlan%d") < 0)
if (dev_alloc_name(pnetdev,"mgnt.wlan%d") < 0)
DBG_871X("hostapd_mode_init(): dev_alloc_name, fail!\n");
mac[0]=0x00;
@ -438,7 +438,7 @@ int hostapd_mode_init(struct adapter *padapter)
/* Tell the network stack we exist */
if (register_netdev(pnetdev) != 0) {
DBG_871X("hostapd_mode_init(): register_netdev fail!\n");
if(pnetdev)
if (pnetdev)
rtw_free_netdev(pnetdev);
}
return 0;

98
os_dep/os_intfs.c
View file

@ -358,7 +358,7 @@ static int rtw_net_set_mac_address(struct net_device *pnetdev, void *p)
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
struct sockaddr *addr = p;
if(padapter->bup == false)
if (padapter->bup == false)
{
/* DBG_871X("r8711_net_set_mac_address(), MAC=%x:%x:%x:%x:%x:%x\n", addr->sa_data[0], addr->sa_data[1], addr->sa_data[2], addr->sa_data[3], */
/* addr->sa_data[4], addr->sa_data[5]); */
@ -435,7 +435,7 @@ static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb
skb->priority = rtw_classify8021d(skb);
if(pmlmepriv->acm_mask != 0)
if (pmlmepriv->acm_mask != 0)
{
skb->priority = qos_acm(pmlmepriv->acm_mask, skb->priority);
}
@ -500,7 +500,7 @@ int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname)
struct adapter *TargetAdapter = NULL;
struct net *devnet = NULL;
if(padapter->bDongle == 1)
if (padapter->bDongle == 1)
{
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
TargetNetdev = dev_get_by_name("wlan0");
@ -512,7 +512,7 @@ int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname)
#endif
TargetNetdev = dev_get_by_name(devnet, "wlan0");
#endif
if(TargetNetdev) {
if (TargetNetdev) {
DBG_871X("Force onboard module driver disappear !!!\n");
TargetAdapter = rtw_netdev_priv(TargetNetdev);
TargetAdapter->DriverState = DRIVER_DISAPPEAR;
@ -524,7 +524,7 @@ int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname)
dev_put(TargetNetdev);
unregister_netdev(TargetNetdev);
if(TargetAdapter->chip_type == padapter->chip_type)
if (TargetAdapter->chip_type == padapter->chip_type)
rtw_proc_remove_one(TargetNetdev);
padapter->DriverState = DRIVER_REPLACE_DONGLE;
@ -532,7 +532,7 @@ int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname)
}
#endif
if(dev_alloc_name(pnetdev, ifname) < 0)
if (dev_alloc_name(pnetdev, ifname) < 0)
{
RT_TRACE(_module_os_intfs_c_,_drv_err_,("dev_alloc_name, fail!\n"));
}
@ -550,7 +550,7 @@ struct net_device *rtw_init_netdev(struct adapter *old_padapter)
RT_TRACE(_module_os_intfs_c_,_drv_info_,("+init_net_dev\n"));
if(old_padapter != NULL)
if (old_padapter != NULL)
pnetdev = rtw_alloc_etherdev_with_old_priv(sizeof(struct adapter), (void *)old_padapter);
else
pnetdev = rtw_alloc_etherdev(sizeof(struct adapter));
@ -597,7 +597,7 @@ u32 rtw_start_drv_threads(struct adapter *padapter)
RT_TRACE(_module_os_intfs_c_,_drv_info_,("+rtw_start_drv_threads\n"));
padapter->cmdThread = kthread_run(rtw_cmd_thread, padapter, "RTW_CMD_THREAD");
if(IS_ERR(padapter->cmdThread))
if (IS_ERR(padapter->cmdThread))
_status = _FAIL;
else
_rtw_down_sema(&padapter->cmdpriv.terminate_cmdthread_sema); /* wait for cmd_thread to run */
@ -623,7 +623,7 @@ void rtw_unregister_netdevs(struct dvobj_priv *dvobj)
pnetdev = padapter->pnetdev;
if((padapter->DriverState != DRIVER_DISAPPEAR) && pnetdev) {
if ((padapter->DriverState != DRIVER_DISAPPEAR) && pnetdev) {
unregister_netdev(pnetdev); /* will call netdev_close() */
rtw_proc_remove_one(pnetdev);
@ -791,26 +791,26 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
reset_global_wifidirect_info(padapter);
rtw_init_cfg80211_wifidirect_info(padapter);
#ifdef CONFIG_P2P
if(rtw_init_wifi_display_info(padapter) == _FAIL)
if (rtw_init_wifi_display_info(padapter) == _FAIL)
RT_TRACE(_module_os_intfs_c_,_drv_err_,("\n Can't init init_wifi_display_info\n"));
#endif
#endif /* CONFIG_P2P */
if(init_mlme_ext_priv(padapter) == _FAIL)
if (init_mlme_ext_priv(padapter) == _FAIL)
{
RT_TRACE(_module_os_intfs_c_,_drv_err_,("\n Can't init mlme_ext_priv\n"));
ret8=_FAIL;
goto exit;
}
if(_rtw_init_xmit_priv(&padapter->xmitpriv, padapter) == _FAIL)
if (_rtw_init_xmit_priv(&padapter->xmitpriv, padapter) == _FAIL)
{
DBG_871X("Can't _rtw_init_xmit_priv\n");
ret8=_FAIL;
goto exit;
}
if(_rtw_init_recv_priv(&padapter->recvpriv, padapter) == _FAIL)
if (_rtw_init_recv_priv(&padapter->recvpriv, padapter) == _FAIL)
{
DBG_871X("Can't _rtw_init_recv_priv\n");
ret8=_FAIL;
@ -824,7 +824,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
/* _init_timer(&(padapter->securitypriv.tkip_timer), padapter->pifp, rtw_use_tkipkey_handler, padapter); */
if(_rtw_init_sta_priv(&padapter->stapriv) == _FAIL)
if (_rtw_init_sta_priv(&padapter->stapriv) == _FAIL)
{
DBG_871X("Can't _rtw_init_sta_priv\n");
ret8=_FAIL;
@ -904,7 +904,7 @@ u8 rtw_free_drv_sw(struct adapter *padapter)
#ifdef CONFIG_P2P
{
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
if(!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
if (!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
{
_cancel_timer_ex( &pwdinfo->find_phase_timer );
_cancel_timer_ex( &pwdinfo->restore_p2p_state_timer );
@ -947,13 +947,13 @@ u8 rtw_free_drv_sw(struct adapter *padapter)
RT_TRACE(_module_os_intfs_c_,_drv_info_,("<==rtw_free_drv_sw\n"));
/* free the old_pnetdev */
if(padapter->rereg_nd_name_priv.old_pnetdev) {
if (padapter->rereg_nd_name_priv.old_pnetdev) {
free_netdev(padapter->rereg_nd_name_priv.old_pnetdev);
padapter->rereg_nd_name_priv.old_pnetdev = NULL;
}
/* clear pbuddy_adapter to avoid access wrong pointer. */
if(padapter->pbuddy_adapter != NULL) {
if (padapter->pbuddy_adapter != NULL) {
padapter->pbuddy_adapter->pbuddy_adapter = NULL;
}
@ -972,7 +972,7 @@ void netdev_br_init(struct net_device *netdev)
rcu_read_lock();
#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) */
/* if(check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == true) */
/* if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == true) */
{
/* struct net_bridge *br = netdev->br_port->br;->dev->dev_addr; */
#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
@ -1035,7 +1035,7 @@ static int _rtw_drv_register_netdev(struct adapter *padapter, char *name)
error_register_netdev:
if(padapter->iface_id > IFACE_ID0)
if (padapter->iface_id > IFACE_ID0)
{
rtw_free_drv_sw(padapter);
@ -1050,24 +1050,24 @@ int rtw_drv_register_netdev(struct adapter *if1)
int i, status = _SUCCESS;
struct dvobj_priv *dvobj = if1->dvobj;
if(dvobj->iface_nums < IFACE_ID_MAX)
if (dvobj->iface_nums < IFACE_ID_MAX)
{
for(i=0; i<dvobj->iface_nums; i++)
{
struct adapter *padapter = dvobj->padapters[i];
if(padapter)
if (padapter)
{
char *name;
if(padapter->iface_id == IFACE_ID0)
if (padapter->iface_id == IFACE_ID0)
name = if1->registrypriv.ifname;
else if(padapter->iface_id == IFACE_ID1)
else if (padapter->iface_id == IFACE_ID1)
name = if1->registrypriv.if2name;
else
name = "wlan%d";
if((status = _rtw_drv_register_netdev(padapter, name)) != _SUCCESS) {
if ((status = _rtw_drv_register_netdev(padapter, name)) != _SUCCESS) {
break;
}
}
@ -1086,12 +1086,12 @@ int _netdev_open(struct net_device *pnetdev)
RT_TRACE(_module_os_intfs_c_,_drv_info_,("+871x_drv - dev_open\n"));
DBG_871X("+871x_drv - drv_open, bup=%d\n", padapter->bup);
if(pwrctrlpriv->ps_flag == true){
if (pwrctrlpriv->ps_flag == true){
padapter->net_closed = false;
goto netdev_open_normal_process;
}
if(padapter->bup == false)
if (padapter->bup == false)
{
padapter->bDriverStopped = false;
padapter->bSurpriseRemoved = false;
@ -1107,7 +1107,7 @@ int _netdev_open(struct net_device *pnetdev)
DBG_871X("MAC Address = "MAC_FMT"\n", MAC_ARG(pnetdev->dev_addr));
status=rtw_start_drv_threads(padapter);
if(status ==_FAIL)
if (status ==_FAIL)
{
DBG_871X("Initialize driver software resource Failed!\n");
goto netdev_open_error;
@ -1117,7 +1117,7 @@ int _netdev_open(struct net_device *pnetdev)
init_drvext(padapter);
#endif
if(padapter->intf_start)
if (padapter->intf_start)
{
padapter->intf_start(padapter);
}
@ -1139,7 +1139,7 @@ int _netdev_open(struct net_device *pnetdev)
rtw_set_pwr_state_check_timer(pwrctrlpriv);
/* netif_carrier_on(pnetdev);call this func when rtw_joinbss_event_callback return success */
if(!rtw_netif_queue_stopped(pnetdev))
if (!rtw_netif_queue_stopped(pnetdev))
rtw_netif_start_queue(pnetdev);
else
rtw_netif_wake_queue(pnetdev);
@ -1198,7 +1198,7 @@ static int ips_netdrv_open(struct adapter *padapter)
goto netdev_open_error;
}
if(padapter->intf_start)
if (padapter->intf_start)
padapter->intf_start(padapter);
rtw_set_pwr_state_check_timer(adapter_to_pwrctl(padapter));
@ -1253,13 +1253,13 @@ void rtw_ips_dev_unload(struct adapter *padapter)
rtw_hal_set_hwreg(padapter, HW_VAR_FIFO_CLEARN_UP, NULL);
if(padapter->intf_stop)
if (padapter->intf_stop)
{
padapter->intf_stop(padapter);
}
/* s5. */
if(padapter->bSurpriseRemoved == false)
if (padapter->bSurpriseRemoved == false)
{
rtw_hal_deinit(padapter);
}
@ -1285,19 +1285,19 @@ static int netdev_close(struct net_device *pnetdev)
RT_TRACE(_module_os_intfs_c_,_drv_info_,("+871x_drv - drv_close\n"));
if(adapter_to_pwrctl(padapter)->bInternalAutoSuspend == true)
if (adapter_to_pwrctl(padapter)->bInternalAutoSuspend == true)
{
/* rtw_pwr_wakeup(padapter); */
if(adapter_to_pwrctl(padapter)->rf_pwrstate == rf_off)
if (adapter_to_pwrctl(padapter)->rf_pwrstate == rf_off)
adapter_to_pwrctl(padapter)->ps_flag = true;
}
padapter->net_closed = true;
if(adapter_to_pwrctl(padapter)->rf_pwrstate == rf_on){
if (adapter_to_pwrctl(padapter)->rf_pwrstate == rf_on){
DBG_871X("(2)871x_drv - drv_close, bup=%d, hw_init_completed=%d\n", padapter->bup, padapter->hw_init_completed);
/* s1. */
if(pnetdev)
if (pnetdev)
{
if (!rtw_netif_queue_stopped(pnetdev))
rtw_netif_stop_queue(pnetdev);
@ -1498,7 +1498,7 @@ restart:
memset(&rt_info, 0, sizeof(struct route_info));
parse_routes(h, &rt_info);
if(!rt_info.dst_addr.s_addr && rt_info.gateway.s_addr && rt_info.dev_index)
if (!rt_info.dst_addr.s_addr && rt_info.gateway.s_addr && rt_info.dev_index)
{
*gw_addr = rt_info.gateway.s_addr;
*gw_index = rt_info.dev_index;
@ -1574,7 +1574,7 @@ static int get_defaultgw(u32 *ip_addr ,char mac[])
route_dump(ip_addr, &gw_index);
if( !(*ip_addr) || !gw_index )
if ( !(*ip_addr) || !gw_index )
{
/* DBG_871X("No default GW\n"); */
return -1;
@ -1582,13 +1582,13 @@ static int get_defaultgw(u32 *ip_addr ,char mac[])
gw_dev = dev_get_by_index(&init_net, gw_index);
if(gw_dev == NULL)
if (gw_dev == NULL)
{
/* DBG_871X("get Oif Device Fail\n"); */
return -1;
}
if(!arp_query(mac, *ip_addr, gw_dev))
if (!arp_query(mac, *ip_addr, gw_dev))
{
/* DBG_871X( "arp query failed\n"); */
dev_put(gw_dev);
@ -1609,7 +1609,7 @@ int rtw_gw_addr_query(struct adapter *padapter)
int res;
res = get_defaultgw(&gw_addr, gw_mac);
if(!res)
if (!res)
{
pmlmepriv->gw_ip[0] = gw_addr&0xff;
pmlmepriv->gw_ip[1] = (gw_addr&0xff00)>>8;
@ -1637,12 +1637,12 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter)
DBG_871X("==> "FUNC_ADPT_FMT" entry....\n", FUNC_ADPT_ARG(padapter));
rtw_cancel_all_timer(padapter);
if(pnetdev){
if (pnetdev){
netif_carrier_off(pnetdev);
rtw_netif_stop_queue(pnetdev);
}
if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED) && rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED) && rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
{
DBG_871X("%s %s(" MAC_FMT "), length:%d assoc_ssid.length:%d\n",__FUNCTION__,
pmlmepriv->cur_network.network.Ssid.Ssid,
@ -1652,17 +1652,17 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter)
rtw_set_roaming(padapter, 1);
}
if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED))
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED))
{
rtw_disassoc_cmd(padapter, 0, false);
}
#ifdef CONFIG_AP_MODE
else if(check_fwstate(pmlmepriv, WIFI_AP_STATE))
else if (check_fwstate(pmlmepriv, WIFI_AP_STATE))
{
rtw_sta_flush(padapter);
}
#endif
if(check_fwstate(pmlmepriv, WIFI_STATION_STATE) ){
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) ){
/* s2-2. indicate disconnect to os */
rtw_indicate_disconnect(padapter);
}
@ -1672,11 +1672,11 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter)
/* s2-4. */
#ifdef CONFIG_AUTOSUSPEND
if(is_primary_adapter(padapter) && (!adapter_to_pwrctl(padapter)->bInternalAutoSuspend ))
if (is_primary_adapter(padapter) && (!adapter_to_pwrctl(padapter)->bInternalAutoSuspend ))
#endif
rtw_free_network_queue(padapter, true);
if(check_fwstate(pmlmepriv, _FW_UNDER_SURVEY))
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY))
rtw_indicate_scan_done(padapter, 1);
DBG_871X("==> "FUNC_ADPT_FMT" exit....\n", FUNC_ADPT_ARG(padapter));
@ -1715,7 +1715,7 @@ int rtw_resume_common(struct adapter *padapter)
pwrpriv->bkeepfwalive = false;
DBG_871X("bkeepfwalive(%x)\n",pwrpriv->bkeepfwalive);
if(pm_netdev_open(pnetdev,true) != 0) {
if (pm_netdev_open(pnetdev,true) != 0) {
DBG_871X("%s ==> pm_netdev_open failed\n",__FUNCTION__);
ret = -1;
return ret;

76
os_dep/osdep_service.c
View file

@ -35,7 +35,7 @@
* @return: one of RTW_STATUS_CODE
*/
inline int RTW_STATUS_CODE(int error_code){
if(error_code >=0)
if (error_code >=0)
return _SUCCESS;
switch(error_code) {
@ -52,15 +52,15 @@ u32 rtw_atoi(u8* s)
int num=0,flag=0;
int i;
for(i=0;i<=strlen(s);i++) {
if(s[i] >= '0' && s[i] <= '9')
if (s[i] >= '0' && s[i] <= '9')
num = num * 10 + s[i] -'0';
else if(s[0] == '-' && i==0)
else if (s[0] == '-' && i==0)
flag =1;
else
break;
}
if(flag == 1)
if (flag == 1)
num = num * -1;
return num;
@ -235,7 +235,7 @@ void rtw_mstat_update(const enum mstat_f flags, const MSTAT_STATUS status, u32 s
int i;
/* initialization */
if(!update_time) {
if (!update_time) {
for(i=0;i<mstat_tf_idx(MSTAT_TYPE_MAX);i++) {
ATOMIC_SET(&(rtw_mem_type_stat[i].alloc), 0);
ATOMIC_SET(&(rtw_mem_type_stat[i].peak), 0);
@ -337,10 +337,10 @@ inline u8* dbg_rtw_malloc(u32 sz, const enum mstat_f flags, const char *func, co
{
u8 *p;
/* if(sz>=153 && sz<=306) */
/* if (sz>=153 && sz<=306) */
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */
/* if((sz)>4096) */
/* if ((sz)>4096) */
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */
p=_rtw_malloc((sz));
@ -358,10 +358,10 @@ inline u8* dbg_rtw_zmalloc(u32 sz, const enum mstat_f flags, const char *func, c
{
u8 *p;
/* if(sz>=153 && sz<=306) */
/* if (sz>=153 && sz<=306) */
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */
/* if((sz)>4096) */
/* if ((sz)>4096) */
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */
p = _rtw_zmalloc((sz));
@ -377,10 +377,10 @@ inline u8* dbg_rtw_zmalloc(u32 sz, const enum mstat_f flags, const char *func, c
inline void dbg_rtw_mfree(u8 *pbuf, u32 sz, const enum mstat_f flags, const char *func, const int line)
{
/* if(sz>=153 && sz<=306) */
/* if (sz>=153 && sz<=306) */
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */
/* if((sz)>4096) */
/* if ((sz)>4096) */
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%p,%d)\n", func, line, __FUNCTION__, (pbuf), (sz)); */
_rtw_mfree((pbuf), (sz));
@ -399,10 +399,10 @@ inline struct sk_buff * dbg_rtw_skb_alloc(unsigned int size, const enum mstat_f
skb = _rtw_skb_alloc(size);
if(skb)
if (skb)
truesize = skb->truesize;
if(!skb || truesize < size /*|| size > 4096*/)
if (!skb || truesize < size /*|| size > 4096*/)
DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d), skb:%p, truesize=%u\n", func, line, __FUNCTION__, size, skb, truesize);
rtw_mstat_update(
@ -418,7 +418,7 @@ inline void dbg_rtw_skb_free(struct sk_buff *skb, const enum mstat_f flags, cons
{
unsigned int truesize = skb->truesize;
/* if(truesize > 4096) */
/* if (truesize > 4096) */
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s, truesize=%u\n", func, line, __FUNCTION__, truesize); */
_rtw_skb_free(skb);
@ -437,10 +437,10 @@ inline struct sk_buff *dbg_rtw_skb_copy(const struct sk_buff *skb, const enum ms
unsigned int cp_truesize = 0;
skb_cp = _rtw_skb_copy(skb);
if(skb_cp)
if (skb_cp)
cp_truesize = skb_cp->truesize;
if(!skb_cp || cp_truesize != truesize /*||cp_truesize > 4096*/)
if (!skb_cp || cp_truesize != truesize /*||cp_truesize > 4096*/)
DBG_871X("DBG_MEM_ALLOC %s:%d %s(%u), skb_cp:%p, cp_truesize=%u\n", func, line, __FUNCTION__, truesize, skb_cp, cp_truesize);
rtw_mstat_update(
@ -459,10 +459,10 @@ inline struct sk_buff *dbg_rtw_skb_clone(struct sk_buff *skb, const enum mstat_f
unsigned int cl_truesize = 0;
skb_cl = _rtw_skb_clone(skb);
if(skb_cl)
if (skb_cl)
cl_truesize = skb_cl->truesize;
if(!skb_cl || cl_truesize != truesize /*|| cl_truesize > 4096*/)
if (!skb_cl || cl_truesize != truesize /*|| cl_truesize > 4096*/)
DBG_871X("DBG_MEM_ALLOC %s:%d %s(%u), skb_cl:%p, cl_truesize=%u\n", func, line, __FUNCTION__, truesize, skb_cl, cl_truesize);
rtw_mstat_update(
@ -479,7 +479,7 @@ inline int dbg_rtw_netif_rx(struct net_device * ndev, struct sk_buff *skb, cons
int ret;
unsigned int truesize = skb->truesize;
/* if(truesize > 4096) */
/* if (truesize > 4096) */
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s, truesize=%u\n", func, line, __FUNCTION__, truesize); */
ret = _rtw_netif_rx(ndev, skb);
@ -536,7 +536,7 @@ void* rtw_malloc2d(int h, int w, int size)
int j;
void **a = (void **) rtw_zmalloc( h*sizeof(void *) + h*w*size );
if(a == NULL)
if (a == NULL)
{
DBG_871X("%s: alloc memory fail!\n", __FUNCTION__);
return NULL;
@ -892,7 +892,7 @@ static int openFile(struct file **fpp, char *path, int flag, int mode)
struct file *fp;
fp=filp_open(path, flag, mode);
if(IS_ERR(fp)) {
if (IS_ERR(fp)) {
*fpp=NULL;
return PTR_ERR(fp);
}
@ -922,9 +922,9 @@ static int readFile(struct file *fp,char *buf,int len)
while(sum<len) {
rlen=fp->f_op->read(fp,(char __user *)buf+sum,len-sum, &fp->f_pos);
if(rlen>0)
if (rlen>0)
sum+=rlen;
else if(0 != rlen)
else if (0 != rlen)
return rlen;
else
break;
@ -943,9 +943,9 @@ static int writeFile(struct file *fp,char *buf,int len)
while(sum<len) {
wlen=fp->f_op->write(fp,(char __user *)buf+sum,len-sum, &fp->f_pos);
if(wlen>0)
if (wlen>0)
sum+=wlen;
else if(0 != wlen)
else if (0 != wlen)
return wlen;
else
break;
@ -968,13 +968,13 @@ static int isFileReadable(char *path)
char buf;
fp=filp_open(path, O_RDONLY, 0);
if(IS_ERR(fp)) {
if (IS_ERR(fp)) {
ret = PTR_ERR(fp);
}
else {
oldfs = get_fs(); set_fs(get_ds());
if(1!=readFile(fp, &buf, 1))
if (1!=readFile(fp, &buf, 1))
ret = PTR_ERR(fp);
set_fs(oldfs);
@ -996,8 +996,8 @@ static int retriveFromFile(char *path, u8* buf, u32 sz)
mm_segment_t oldfs;
struct file *fp;
if(path && buf) {
if( 0 == (ret=openFile(&fp,path, O_RDONLY, 0)) ){
if (path && buf) {
if ( 0 == (ret=openFile(&fp,path, O_RDONLY, 0)) ){
DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp);
oldfs = get_fs(); set_fs(get_ds());
@ -1030,8 +1030,8 @@ static int storeToFile(char *path, u8* buf, u32 sz)
mm_segment_t oldfs;
struct file *fp;
if(path && buf) {
if( 0 == (ret=openFile(&fp, path, O_CREAT|O_WRONLY, 0666)) ) {
if (path && buf) {
if ( 0 == (ret=openFile(&fp, path, O_CREAT|O_WRONLY, 0666)) ) {
DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp);
oldfs = get_fs(); set_fs(get_ds());
@ -1058,7 +1058,7 @@ static int storeToFile(char *path, u8* buf, u32 sz)
*/
int rtw_is_file_readable(char *path)
{
if(isFileReadable(path) == 0)
if (isFileReadable(path) == 0)
return true;
else
return false;
@ -1142,12 +1142,12 @@ void rtw_free_netdev(struct net_device * netdev)
{
struct rtw_netdev_priv_indicator *pnpi;
if(!netdev)
if (!netdev)
goto RETURN;
pnpi = netdev_priv(netdev);
if(!pnpi->priv)
if (!pnpi->priv)
goto RETURN;
rtw_vmfree(pnpi->priv, pnpi->sizeof_priv);
@ -1168,20 +1168,20 @@ int rtw_change_ifname(struct adapter *padapter, const char *ifname)
struct rereg_nd_name_data *rereg_priv;
int ret;
if(!padapter)
if (!padapter)
goto error;
cur_pnetdev = padapter->pnetdev;
rereg_priv = &padapter->rereg_nd_name_priv;
/* free the old_pnetdev */
if(rereg_priv->old_pnetdev) {
if (rereg_priv->old_pnetdev) {
free_netdev(rereg_priv->old_pnetdev);
rereg_priv->old_pnetdev = NULL;
}
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26))
if(!rtnl_is_locked())
if (!rtnl_is_locked())
unregister_netdev(cur_pnetdev);
else
#endif
@ -1204,7 +1204,7 @@ int rtw_change_ifname(struct adapter *padapter, const char *ifname)
memcpy(pnetdev->dev_addr, padapter->eeprompriv.mac_addr, ETH_ALEN);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26))
if(!rtnl_is_locked())
if (!rtnl_is_locked())
ret = register_netdev(pnetdev);
else
#endif

36
os_dep/recv_linux.c
View file

@ -58,7 +58,7 @@ void rtw_os_recv_resource_free(struct recv_priv *precvpriv)
for(i=0; i < NR_RECVFRAME; i++)
{
if(precvframe->u.hdr.pkt)
if (precvframe->u.hdr.pkt)
{
rtw_skb_free(precvframe->u.hdr.pkt);/* free skb by driver */
precvframe->u.hdr.pkt = NULL;
@ -79,7 +79,7 @@ int rtw_os_recvbuf_resource_alloc(struct adapter *padapter, struct recv_buf *pre
precvbuf->irp_pending = false;
precvbuf->purb = usb_alloc_urb(0, GFP_KERNEL);
if(precvbuf->purb == NULL){
if (precvbuf->purb == NULL){
res = _FAIL;
}
@ -103,9 +103,9 @@ int rtw_os_recvbuf_resource_free(struct adapter *padapter, struct recv_buf *prec
{
int ret = _SUCCESS;
if(precvbuf->purb)
if (precvbuf->purb)
usb_free_urb(precvbuf->purb);
if(precvbuf->pskb)
if (precvbuf->pskb)
rtw_skb_free(precvbuf->pskb);
return ret;
@ -120,12 +120,12 @@ void rtw_handle_tkip_mic_err(struct adapter *padapter,u8 bgroup)
struct security_priv *psecuritypriv = &padapter->securitypriv;
u32 cur_time = 0;
if( psecuritypriv->last_mic_err_time == 0 ) {
if ( psecuritypriv->last_mic_err_time == 0 ) {
psecuritypriv->last_mic_err_time = rtw_get_current_time();
} else {
cur_time = rtw_get_current_time();
if( cur_time - psecuritypriv->last_mic_err_time < 60*HZ ) {
if ( cur_time - psecuritypriv->last_mic_err_time < 60*HZ ) {
psecuritypriv->btkip_countermeasure = true;
psecuritypriv->last_mic_err_time = 0;
psecuritypriv->btkip_countermeasure_time = cur_time;
@ -174,7 +174,7 @@ void rtw_hostapd_mlme_rx(struct adapter *padapter, union recv_frame *precv_frame
skb->len = precv_frame->u.hdr.len;
/* pskb_copy = rtw_skb_copy(skb); */
/* if(skb == NULL) goto _exit; */
/* if (skb == NULL) goto _exit; */
skb->dev = pmgnt_netdev;
skb->ip_summed = CHECKSUM_NONE;
@ -214,7 +214,7 @@ int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame
if (!precv_frame)
goto _recv_indicatepkt_drop;
skb = precv_frame->u.hdr.pkt;
if(skb == NULL)
if (skb == NULL)
{
RT_TRACE(_module_recv_osdep_c_,_drv_err_,("rtw_recv_indicatepkt():skb==NULL something wrong!!!!\n"));
goto _recv_indicatepkt_drop;
@ -232,7 +232,7 @@ int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame
RT_TRACE(_module_recv_osdep_c_,_drv_info_,("\n skb->head=%p skb->data=%p skb->tail=%p skb->end=%p skb->len=%d\n", skb->head, skb->data, skb->tail, skb->end, skb->len));
if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == true)
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true)
{
struct sk_buff *pskb2=NULL;
struct sta_info *psta = NULL;
@ -242,11 +242,11 @@ int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame
/* DBG_871X("bmcast=%d\n", bmcast); */
if(_rtw_memcmp(pattrib->dst, myid(&padapter->eeprompriv), ETH_ALEN)==false)
if (_rtw_memcmp(pattrib->dst, myid(&padapter->eeprompriv), ETH_ALEN)==false)
{
/* DBG_871X("not ap psta=%p, addr=%pM\n", psta, pattrib->dst); */
if(bmcast)
if (bmcast)
{
psta = rtw_get_bcmc_stainfo(padapter);
pskb2 = rtw_skb_clone(skb);
@ -254,7 +254,7 @@ int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame
psta = rtw_get_stainfo(pstapriv, pattrib->dst);
}
if(psta)
if (psta)
{
struct net_device *pnetdev= (struct net_device*)padapter->pnetdev;
@ -273,7 +273,7 @@ int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame
_rtw_xmit_entry(skb, pnetdev);
if(bmcast)
if (bmcast)
skb = pskb2;
else
goto _recv_indicatepkt_end;
@ -298,7 +298,7 @@ int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame
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 ( br_port && (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == true) )
{
int nat25_handle_frame(struct adapter *priv, struct sk_buff *skb);
if (nat25_handle_frame(padapter, skb) == -1) {
@ -319,14 +319,14 @@ int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame
struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
int bmcast = IS_MCAST(pattrib->dst);
if(bmcast)
if (bmcast)
{
psta = rtw_get_bcmc_stainfo(padapter);
} else {
psta = rtw_get_stainfo(pstapriv, pattrib->src);
}
if(psta)
if (psta)
{
switch(pattrib->priority)
{
@ -369,7 +369,7 @@ _recv_indicatepkt_end:
_recv_indicatepkt_drop:
/* enqueue back to free_recv_queue */
if(precv_frame)
if (precv_frame)
rtw_free_recvframe(precv_frame, pfree_recv_queue);
return _FAIL;
@ -390,7 +390,7 @@ void rtw_os_read_port(struct adapter *padapter, struct recv_buf *precvbuf)
precvbuf->pskb = NULL;
precvbuf->reuse = false;
if(precvbuf->irp_pending == false)
if (precvbuf->irp_pending == false)
{
rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf);
}

10
os_dep/rtw_android.c
View file

@ -231,7 +231,7 @@ int rtw_android_cmdstr_to_num(char *cmdstr)
if (!strncasecmp(cmdstr, android_wifi_cmd_str[cmd_num],
strlen(android_wifi_cmd_str[cmd_num])))
#else
if(0 == strnicmp(cmdstr, android_wifi_cmd_str[cmd_num],
if (0 == strnicmp(cmdstr, android_wifi_cmd_str[cmd_num],
strlen(android_wifi_cmd_str[cmd_num])))
#endif
break;
@ -246,7 +246,7 @@ static int rtw_android_get_rssi(struct net_device *net, char *command, int total
struct wlan_network *pcur_network = &pmlmepriv->cur_network;
int bytes_written = 0;
if(check_fwstate(pmlmepriv, _FW_LINKED) == true) {
if (check_fwstate(pmlmepriv, _FW_LINKED) == true) {
bytes_written += snprintf(&command[bytes_written], total_len, "%s rssi %d",
pcur_network->network.Ssid.Ssid, padapter->recvpriv.rssi);
}
@ -470,7 +470,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
/* wpa_cli driver wfd-enable */
pwfd_info = &padapter->wfd_info;
if( padapter->wdinfo.driver_interface == DRIVER_CFG80211 )
if ( padapter->wdinfo.driver_interface == DRIVER_CFG80211 )
pwfd_info->wfd_enable = true;
break;
case ANDROID_WIFI_CMD_WFD_DISABLE:
@ -479,7 +479,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
/* wpa_cli driver wfd-disable */
pwfd_info = &padapter->wfd_info;
if( padapter->wdinfo.driver_interface == DRIVER_CFG80211 )
if ( padapter->wdinfo.driver_interface == DRIVER_CFG80211 )
pwfd_info->wfd_enable = false;
break;
case ANDROID_WIFI_CMD_WFD_SET_TCPPORT:
@ -488,7 +488,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
/* wpa_cli driver wfd-set-tcpport = 554 */
pwfd_info = &padapter->wfd_info;
if( padapter->wdinfo.driver_interface == DRIVER_CFG80211 )
if ( padapter->wdinfo.driver_interface == DRIVER_CFG80211 )
pwfd_info->rtsp_ctrlport = (u16)get_int_from_command(priv_cmd.buf);
break;
case ANDROID_WIFI_CMD_WFD_SET_MAX_TPUT:

90
os_dep/usb_intf.c
View file

@ -234,7 +234,7 @@ static u8 rtw_deinit_intf_priv(struct dvobj_priv *dvobj)
{
u8 rst = _SUCCESS;
if(dvobj->usb_vendor_req_buf)
if (dvobj->usb_vendor_req_buf)
rtw_mfree(dvobj->usb_alloc_vendor_req_buf, MAX_USB_IO_CTL_SIZE);
_rtw_mutex_free(&dvobj->usb_vendor_req_mutex);
@ -415,7 +415,7 @@ static void usb_intf_stop(struct adapter *padapter)
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+usb_intf_stop\n"));
/* disabel_hw_interrupt */
if(padapter->bSurpriseRemoved == false)
if (padapter->bSurpriseRemoved == false)
{
/* device still exists, so driver can do i/o operation */
/* TODO: */
@ -440,7 +440,7 @@ void rtw_dev_unload(struct adapter *padapter)
u8 val8;
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_dev_unload\n"));
if(padapter->bup == true)
if (padapter->bup == true)
{
DBG_871X("===> rtw_dev_unload\n");
@ -449,18 +449,18 @@ void rtw_dev_unload(struct adapter *padapter)
rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_DRV_STOP);
/* s3. */
if(padapter->intf_stop)
if (padapter->intf_stop)
{
padapter->intf_stop(padapter);
}
/* s4. */
if(!adapter_to_pwrctl(padapter)->bInternalAutoSuspend )
if (!adapter_to_pwrctl(padapter)->bInternalAutoSuspend )
rtw_stop_drv_threads(padapter);
/* s5. */
if(padapter->bSurpriseRemoved == false)
if (padapter->bSurpriseRemoved == false)
{
rtw_hal_deinit(padapter);
padapter->bSurpriseRemoved = true;
@ -490,7 +490,7 @@ static void process_spec_devid(const struct usb_device_id *pdid)
pid = specific_device_id_tbl[i].idProduct;
flags = specific_device_id_tbl[i].flags;
if((pdid->idVendor==vid) && (pdid->idProduct==pid) && (flags&SPEC_DEV_ID_DISABLE_HT))
if ((pdid->idVendor==vid) && (pdid->idProduct==pid) && (flags&SPEC_DEV_ID_DISABLE_HT))
{
rtw_ht_enable = 0;
rtw_cbw40_enable = 0;
@ -505,7 +505,7 @@ int rtw_hw_suspend(struct adapter *padapter )
struct usb_interface *pusb_intf = adapter_to_dvobj(padapter)->pusbintf;
struct net_device *pnetdev = padapter->pnetdev;
if((!padapter->bup) || (padapter->bDriverStopped)||(padapter->bSurpriseRemoved))
if ((!padapter->bup) || (padapter->bDriverStopped)||(padapter->bSurpriseRemoved))
{
DBG_871X("padapter->bup=%d bDriverStopped=%d bSurpriseRemoved = %d\n",
padapter->bup, padapter->bDriverStopped,padapter->bSurpriseRemoved);
@ -518,7 +518,7 @@ int rtw_hw_suspend(struct adapter *padapter )
_enter_pwrlock(&pwrpriv->lock);
pwrpriv->bips_processing = true;
/* s1. */
if(pnetdev)
if (pnetdev)
{
netif_carrier_off(pnetdev);
rtw_netif_stop_queue(pnetdev);
@ -531,7 +531,7 @@ int rtw_hw_suspend(struct adapter *padapter )
{
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
if(check_fwstate(pmlmepriv, _FW_LINKED))
if (check_fwstate(pmlmepriv, _FW_LINKED))
{
_clr_fwstate_(pmlmepriv, _FW_LINKED);
@ -569,7 +569,7 @@ int rtw_hw_resume(struct adapter *padapter)
struct usb_interface *pusb_intf;
struct net_device *pnetdev;
if(padapter)/* system resume */
if (padapter)/* system resume */
{
pwrpriv = adapter_to_pwrctl(padapter);
pusb_intf = adapter_to_dvobj(padapter)->pusbintf;
@ -579,7 +579,7 @@ int rtw_hw_resume(struct adapter *padapter)
pwrpriv->bips_processing = true;
rtw_reset_drv_sw(padapter);
if(pm_netdev_open(pnetdev,false) != 0) {
if (pm_netdev_open(pnetdev,false) != 0) {
_exit_pwrlock(&pwrpriv->lock);
goto error_exit;
}
@ -587,7 +587,7 @@ int rtw_hw_resume(struct adapter *padapter)
netif_device_attach(pnetdev);
netif_carrier_on(pnetdev);
if(!rtw_netif_queue_stopped(pnetdev))
if (!rtw_netif_queue_stopped(pnetdev))
rtw_netif_start_queue(pnetdev);
else
rtw_netif_wake_queue(pnetdev);
@ -627,25 +627,25 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
DBG_871X("==> %s (%s:%d)\n",__FUNCTION__, current->comm, current->pid);
if(!padapter->bup){
if (!padapter->bup){
u8 bMacPwrCtrlOn = false;
rtw_hal_get_hwreg(padapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn);
if(bMacPwrCtrlOn)
if (bMacPwrCtrlOn)
rtw_hal_power_off(padapter);
}
if((!padapter->bup) || (padapter->bDriverStopped)||(padapter->bSurpriseRemoved))
if ((!padapter->bup) || (padapter->bDriverStopped)||(padapter->bSurpriseRemoved))
{
DBG_871X("padapter->bup=%d bDriverStopped=%d bSurpriseRemoved = %d\n",
padapter->bup, padapter->bDriverStopped,padapter->bSurpriseRemoved);
goto exit;
}
if(pwrpriv->bInternalAutoSuspend )
if (pwrpriv->bInternalAutoSuspend )
{
#ifdef CONFIG_AUTOSUSPEND
/* The FW command register update must after MAC and FW init ready. */
if((padapter->bFWReady) && (pwrpriv->bHWPwrPindetect ) && (padapter->registrypriv.usbss_enable ))
if ((padapter->bFWReady) && (pwrpriv->bHWPwrPindetect ) && (padapter->registrypriv.usbss_enable ))
{
u8 bOpen = true;
rtw_interface_ps_func(padapter,HAL_USB_SELECT_SUSPEND,&bOpen);
@ -679,7 +679,7 @@ static int rtw_resume(struct usb_interface *pusb_intf)
struct pwrctrl_priv *pwrpriv = dvobj_to_pwrctl(dvobj);
int ret = 0;
if(pwrpriv->bInternalAutoSuspend ){
if (pwrpriv->bInternalAutoSuspend ){
ret = rtw_resume_process(padapter);
} else {
if (rtw_is_earlysuspend_registered(pwrpriv)) {
@ -706,7 +706,7 @@ int rtw_resume_process(struct adapter *padapter)
DBG_871X("==> %s (%s:%d)\n",__FUNCTION__, current->comm, current->pid);
if(padapter) {
if (padapter) {
pnetdev= padapter->pnetdev;
pwrpriv = adapter_to_pwrctl(padapter);
} else {
@ -725,7 +725,7 @@ int rtw_resume_process(struct adapter *padapter)
#endif
DBG_871X("pwrpriv->bAutoResume (%x)\n",pwrpriv->bAutoResume );
if( true == pwrpriv->bAutoResume ){
if ( true == pwrpriv->bAutoResume ){
pwrpriv->bInternalAutoSuspend = false;
pwrpriv->bAutoResume=false;
DBG_871X("pwrpriv->bAutoResume (%x) pwrpriv->bInternalAutoSuspend(%x)\n",pwrpriv->bAutoResume,pwrpriv->bInternalAutoSuspend );
@ -735,18 +735,18 @@ int rtw_resume_process(struct adapter *padapter)
#endif /* ifdef CONFIG_BT_COEXIST */
if(rtw_resume_common(padapter)!= 0) {
if (rtw_resume_common(padapter)!= 0) {
DBG_871X("%s rtw_resume_common failed\n",__FUNCTION__);
_exit_pwrlock(&pwrpriv->lock);
goto exit;
}
#ifdef CONFIG_AUTOSUSPEND
if(pwrpriv->bInternalAutoSuspend )
if (pwrpriv->bInternalAutoSuspend )
{
#ifdef CONFIG_AUTOSUSPEND
/* The FW command register update must after MAC and FW init ready. */
if((padapter->bFWReady) && (pwrpriv->bHWPwrPindetect) && (padapter->registrypriv.usbss_enable ))
if ((padapter->bFWReady) && (pwrpriv->bHWPwrPindetect) && (padapter->registrypriv.usbss_enable ))
{
u8 bOpen = false;
rtw_interface_ps_func(padapter,HAL_USB_SELECT_SUSPEND,&bOpen);
@ -754,7 +754,7 @@ int rtw_resume_process(struct adapter *padapter)
#endif
#ifdef CONFIG_BT_COEXIST
DBG_871X("pwrpriv->bAutoResume (%x)\n",pwrpriv->bAutoResume );
if( true == pwrpriv->bAutoResume ){
if ( true == pwrpriv->bAutoResume ){
pwrpriv->bInternalAutoSuspend = false;
pwrpriv->bAutoResume=false;
DBG_871X("pwrpriv->bAutoResume (%x) pwrpriv->bInternalAutoSuspend(%x)\n",pwrpriv->bAutoResume,pwrpriv->bInternalAutoSuspend );
@ -768,7 +768,7 @@ int rtw_resume_process(struct adapter *padapter)
#endif
_exit_pwrlock(&pwrpriv->lock);
if( padapter->pid[1]!=0) {
if ( padapter->pid[1]!=0) {
DBG_871X("pid[1]:%d\n",padapter->pid[1]);
rtw_signal_process(padapter->pid[1], SIGUSR2);
}
@ -793,7 +793,7 @@ void autosuspend_enter(struct adapter* padapter)
pwrpriv->bInternalAutoSuspend = true;
pwrpriv->bips_processing = true;
if(rf_off == pwrpriv->change_rfpwrstate )
if (rf_off == pwrpriv->change_rfpwrstate )
{
#ifndef CONFIG_BT_COEXIST
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35))
@ -810,7 +810,7 @@ void autosuspend_enter(struct adapter* padapter)
usb_autosuspend_device(dvobj->pusbdev, 1);
#endif
#else /* ifndef CONFIG_BT_COEXIST */
if(1==pwrpriv->autopm_cnt){
if (1==pwrpriv->autopm_cnt){
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35))
usb_enable_autosuspend(dvobj->pusbdev);
#else
@ -849,7 +849,7 @@ int autoresume_enter(struct adapter* padapter)
DBG_871X("====> autoresume_enter\n");
if(rf_off == pwrpriv->rf_pwrstate )
if (rf_off == pwrpriv->rf_pwrstate )
{
pwrpriv->ps_flag = false;
#ifndef CONFIG_BT_COEXIST
@ -873,7 +873,7 @@ int autoresume_enter(struct adapter* padapter)
#endif
#else /* ifndef CONFIG_BT_COEXIST */
pwrpriv->bAutoResume=true;
if(0==pwrpriv->autopm_cnt){
if (0==pwrpriv->autopm_cnt){
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33))
if (usb_autopm_get_interface(dvobj->pusbintf) < 0)
{
@ -940,13 +940,13 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
if (rtw_handle_dualmac(padapter, 1) != _SUCCESS)
goto free_adapter;
if((pnetdev = rtw_init_netdev(padapter)) == NULL) {
if ((pnetdev = rtw_init_netdev(padapter)) == NULL) {
goto handle_dualmac;
}
SET_NETDEV_DEV(pnetdev, dvobj_to_dev(dvobj));
padapter = rtw_netdev_priv(pnetdev);
if(rtw_wdev_alloc(padapter, dvobj_to_dev(dvobj)) != 0) {
if (rtw_wdev_alloc(padapter, dvobj_to_dev(dvobj)) != 0) {
goto handle_dualmac;
}
@ -969,14 +969,14 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
rtw_hal_read_chip_info(padapter);
/* step 5. */
if(rtw_init_drv_sw(padapter) ==_FAIL) {
if (rtw_init_drv_sw(padapter) ==_FAIL) {
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("Initialize driver software resource Failed!\n"));
goto free_hal_data;
}
#ifdef CONFIG_PM
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18))
if(adapter_to_pwrctl(padapter)->bSupportRemoteWakeup)
if (adapter_to_pwrctl(padapter)->bSupportRemoteWakeup)
{
dvobj->pusbdev->do_remote_wakeup=1;
pusb_intf->needs_remote_wakeup = 1;
@ -988,9 +988,9 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
#endif
#ifdef CONFIG_AUTOSUSPEND
if( padapter->registrypriv.power_mgnt != PS_MODE_ACTIVE )
if ( padapter->registrypriv.power_mgnt != PS_MODE_ACTIVE )
{
if(padapter->registrypriv.usbss_enable ){ /* autosuspend (2s delay) */
if (padapter->registrypriv.usbss_enable ){ /* autosuspend (2s delay) */
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,38))
dvobj->pusbdev->dev.power.autosuspend_delay = 0 * HZ;/* 15 * HZ; idle-delay time */
#else
@ -1038,10 +1038,10 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
status = _SUCCESS;
free_hal_data:
if(status != _SUCCESS && padapter->HalData)
if (status != _SUCCESS && padapter->HalData)
kfree(padapter->HalData);
free_wdev:
if(status != _SUCCESS) {
if (status != _SUCCESS) {
rtw_wdev_unregister(padapter->rtw_wdev);
rtw_wdev_free(padapter->rtw_wdev);
}
@ -1066,7 +1066,7 @@ static void rtw_usb_if1_deinit(struct adapter *if1)
struct mlme_priv *pmlmepriv= &if1->mlmepriv;
struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(if1);
if(check_fwstate(pmlmepriv, _FW_LINKED))
if (check_fwstate(pmlmepriv, _FW_LINKED))
rtw_disassoc_cmd(if1, 0, false);
@ -1084,13 +1084,13 @@ static void rtw_usb_if1_deinit(struct adapter *if1)
rtw_handle_dualmac(if1, 0);
if(if1->rtw_wdev) {
if (if1->rtw_wdev) {
/* rtw_wdev_unregister(if1->rtw_wdev); */
rtw_wdev_free(if1->rtw_wdev);
}
#ifdef CONFIG_BT_COEXIST
if(1 == pwrctl->autopm_cnt){
if (1 == pwrctl->autopm_cnt){
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33))
usb_autopm_put_interface(adapter_to_dvobj(if1)->pusbintf);
#elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,20))
@ -1104,7 +1104,7 @@ static void rtw_usb_if1_deinit(struct adapter *if1)
rtw_free_drv_sw(if1);
if(pnetdev)
if (pnetdev)
rtw_free_netdev(pnetdev);
}
@ -1234,13 +1234,13 @@ static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device
rtw_sw_export=if1;
#endif
if(ui_pid[1]!=0) {
if (ui_pid[1]!=0) {
DBG_871X("ui_pid[1]:%d\n",ui_pid[1]);
rtw_signal_process(ui_pid[1], SIGUSR2);
}
/* dev_alloc_name && register_netdev */
if((status = rtw_drv_register_netdev(if1)) != _SUCCESS) {
if ((status = rtw_drv_register_netdev(if1)) != _SUCCESS) {
goto free_if2;
}
@ -1281,7 +1281,7 @@ static void rtw_dev_remove(struct usb_interface *pusb_intf)
dvobj->processing_dev_remove = true;
rtw_unregister_netdevs(dvobj);
if(usb_drv->drv_registered == true)
if (usb_drv->drv_registered == true)
{
/* DBG_871X("r871xu_dev_remove():padapter->bSurpriseRemoved == true\n"); */
padapter->bSurpriseRemoved = true;

24
os_dep/usb_ops_linux.c
View file

@ -190,14 +190,14 @@ static void usb_bulkout_zero_complete(struct urb *purb, struct pt_regs *regs)
/* DBG_8192C("+usb_bulkout_zero_complete\n"); */
if(pcontext)
if (pcontext)
{
if(pcontext->pbuf)
if (pcontext->pbuf)
{
rtw_mfree(pcontext->pbuf, sizeof(int));
}
if(pcontext->purb && (pcontext->purb==purb))
if (pcontext->purb && (pcontext->purb==purb))
{
usb_free_urb(pcontext->purb);
}
@ -223,7 +223,7 @@ static u32 usb_bulkout_zero(struct intf_hdl *pintfhdl, u32 addr)
/* DBG_871X("%s\n", __func__); */
if((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) ||(dvobj_to_pwrctl(pdvobj)->pnp_bstop_trx))
if ((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) ||(dvobj_to_pwrctl(pdvobj)->pnp_bstop_trx))
{
return _FAIL;
}
@ -340,7 +340,7 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs)
}
if(padapter->bSurpriseRemoved || padapter->bDriverStopped ||padapter->bWritePortCancel)
if (padapter->bSurpriseRemoved || padapter->bDriverStopped ||padapter->bWritePortCancel)
{
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete:bDriverStopped(%d) OR bSurpriseRemoved(%d)", padapter->bDriverStopped, padapter->bSurpriseRemoved));
DBG_8192C("%s(): TX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bWritePortCancel(%d) pxmitbuf->ext_tag(%x)\n",
@ -355,7 +355,7 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs)
} else {
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete : purb->status(%d) != 0\n", purb->status));
DBG_871X("###=> urb_write_port_complete status(%d)\n",purb->status);
if((purb->status==-EPIPE)||(purb->status==-EPROTO))
if ((purb->status==-EPIPE)||(purb->status==-EPROTO))
{
/* usb_clear_halt(pusbdev, purb->pipe); */
/* msleep(10); */
@ -402,7 +402,7 @@ check_completion:
rtw_free_xmitbuf(pxmitpriv, pxmitbuf);
/* if(rtw_txframes_pending(padapter)) */
/* if (rtw_txframes_pending(padapter)) */
{
tasklet_hi_schedule(&pxmitpriv->xmit_tasklet);
}
@ -475,15 +475,15 @@ u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)
int bmcast = IS_MCAST(pattrib->dst);
u8 agg_num = 1;
if(pxmitframe->agg_num>1)
if (pxmitframe->agg_num>1)
agg_num = pxmitframe->agg_num;
if(bmcast)
if (bmcast)
psta = rtw_get_bcmc_stainfo(padapter);
else
psta = rtw_get_stainfo(pstapriv, pattrib->dst);
if(psta) {
if (psta) {
switch(pattrib->priority) {
case 1:
case 2:
@ -553,7 +553,7 @@ u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)
/* Commented by Albert 2009/10/13 */
/* We add the URB_ZERO_PACKET flag to urb so that the host will send the zero packet automatically. */
/*
if(bwritezero == true)
if (bwritezero == true)
{
usb_bulkout_zero(pintfhdl, addr);
}
@ -591,7 +591,7 @@ void usb_write_port_cancel(struct intf_hdl *pintfhdl)
pxmitbuf = (struct xmit_buf*)padapter->xmitpriv.pxmit_extbuf;
for (i = 0; i < NR_XMIT_EXTBUFF; i++) {
for (j=0; j<8; j++) {
if(pxmitbuf->pxmit_urb[j]) {
if (pxmitbuf->pxmit_urb[j]) {
usb_kill_urb(pxmitbuf->pxmit_urb[j]);
}
}

22
os_dep/xmit_linux.c
View file

@ -89,7 +89,7 @@ int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *pxmitb
for(i=0; i<8; i++) {
pxmitbuf->pxmit_urb[i] = usb_alloc_urb(0, GFP_KERNEL);
if(pxmitbuf->pxmit_urb[i] == NULL) {
if (pxmitbuf->pxmit_urb[i] == NULL) {
DBG_871X("pxmitbuf->pxmit_urb[i]==NULL");
return _FAIL;
}
@ -107,14 +107,14 @@ void rtw_os_xmit_resource_free(struct adapter *padapter, struct xmit_buf *pxmitb
for(i=0; i<8; i++)
{
if(pxmitbuf->pxmit_urb[i])
if (pxmitbuf->pxmit_urb[i])
{
/* usb_kill_urb(pxmitbuf->pxmit_urb[i]); */
usb_free_urb(pxmitbuf->pxmit_urb[i]);
}
}
if(pxmitbuf->pallocated_buf)
if (pxmitbuf->pallocated_buf)
rtw_mfree(pxmitbuf->pallocated_buf, free_sz);
}
@ -128,13 +128,13 @@ void rtw_os_pkt_complete(struct adapter *padapter, struct sk_buff *pkt)
queue = skb_get_queue_mapping(pkt);
if (padapter->registrypriv.wifi_spec) {
if(__netif_subqueue_stopped(padapter->pnetdev, queue) &&
if (__netif_subqueue_stopped(padapter->pnetdev, queue) &&
(pxmitpriv->hwxmits[queue].accnt < WMM_XMIT_THRESHOLD))
{
netif_wake_subqueue(padapter->pnetdev, queue);
}
} else {
if(__netif_subqueue_stopped(padapter->pnetdev, queue))
if (__netif_subqueue_stopped(padapter->pnetdev, queue))
netif_wake_subqueue(padapter->pnetdev, queue);
}
#else
@ -147,7 +147,7 @@ void rtw_os_pkt_complete(struct adapter *padapter, struct sk_buff *pkt)
void rtw_os_xmit_complete(struct adapter *padapter, struct xmit_frame *pxframe)
{
if(pxframe->pkt)
if (pxframe->pkt)
rtw_os_pkt_complete(padapter, pxframe->pkt);
pxframe->pkt = NULL;
@ -160,14 +160,14 @@ void rtw_os_xmit_schedule(struct adapter *padapter)
unsigned long irqL;
struct xmit_priv *pxmitpriv;
if(!padapter)
if (!padapter)
return;
pxmitpriv = &padapter->xmitpriv;
spin_lock_bh(&pxmitpriv->lock);
if(rtw_txframes_pending(padapter))
if (rtw_txframes_pending(padapter))
tasklet_hi_schedule(&pxmitpriv->xmit_tasklet);
spin_unlock_bh(&pxmitpriv->lock);
@ -187,13 +187,13 @@ static void rtw_check_xmit_resource(struct adapter *padapter, struct sk_buff *pk
netif_stop_subqueue(padapter->pnetdev, queue);
}
} else {
if(pxmitpriv->free_xmitframe_cnt<=4) {
if (pxmitpriv->free_xmitframe_cnt<=4) {
if (!netif_tx_queue_stopped(netdev_get_tx_queue(padapter->pnetdev, queue)))
netif_stop_subqueue(padapter->pnetdev, queue);
}
}
#else
if(pxmitpriv->free_xmitframe_cnt<=4)
if (pxmitpriv->free_xmitframe_cnt<=4)
{
if (!rtw_netif_queue_stopped(padapter->pnetdev))
rtw_netif_stop_queue(padapter->pnetdev);
@ -235,7 +235,7 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb)
for (i = 0; i < chk_alive_num; i++) {
psta = rtw_get_stainfo_by_offset(pstapriv, chk_alive_list[i]);
if(!(psta->state &_FW_LINKED))
if (!(psta->state &_FW_LINKED))
continue;
/* avoid come from STA1 and send back STA1 */