diff --git a/core/rtw_ap.c b/core/rtw_ap.c index 2db73f6..6c10939 100755 --- a/core/rtw_ap.c +++ b/core/rtw_ap.c @@ -41,7 +41,7 @@ void init_mlme_ap_info(struct adapter *padapter) struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; - _rtw_spinlock_init(&pmlmepriv->bcn_update_lock); + spin_lock_init(&pmlmepriv->bcn_update_lock); /* for ACL */ _rtw_init_queue(&pacl_list->acl_node_q); diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c index c684244..969aaaa 100755 --- a/core/rtw_mlme.c +++ b/core/rtw_mlme.c @@ -59,7 +59,7 @@ sint _rtw_init_mlme_priv (struct adapter* padapter) pmlmepriv->cur_network.network.InfrastructureMode = Ndis802_11AutoUnknown; pmlmepriv->scan_mode=SCAN_ACTIVE;/* 1: active, 0: pasive. Maybe someday we should rename this varable to "active_mode" (Jeff) */ - _rtw_spinlock_init(&(pmlmepriv->lock)); + spin_lock_init(&(pmlmepriv->lock)); _rtw_init_queue(&(pmlmepriv->free_bss_pool)); _rtw_init_queue(&(pmlmepriv->scanned_queue)); diff --git a/core/rtw_recv.c b/core/rtw_recv.c index 3853a73..8932370 100755 --- a/core/rtw_recv.c +++ b/core/rtw_recv.c @@ -47,7 +47,7 @@ void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv) memset((u8 *)psta_recvpriv, 0, sizeof (struct sta_recv_priv)); - _rtw_spinlock_init(&psta_recvpriv->lock); + spin_lock_init(&psta_recvpriv->lock); /* for(i=0; iblk_strms[i]); */ @@ -71,7 +71,7 @@ sint _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter) /* We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). */ /* memset((unsigned char *)precvpriv, 0, sizeof (struct recv_priv)); */ - _rtw_spinlock_init(&precvpriv->lock); + spin_lock_init(&precvpriv->lock); _rtw_init_queue(&precvpriv->free_recv_queue); _rtw_init_queue(&precvpriv->recv_pending_queue); diff --git a/core/rtw_sta_mgt.c b/core/rtw_sta_mgt.c index 7bcfd5a..8fe8eac 100755 --- a/core/rtw_sta_mgt.c +++ b/core/rtw_sta_mgt.c @@ -37,7 +37,7 @@ void _rtw_init_stainfo(struct sta_info *psta) memset((u8 *)psta, 0, sizeof (struct sta_info)); - _rtw_spinlock_init(&psta->lock); + spin_lock_init(&psta->lock); _rtw_init_listhead(&psta->list); _rtw_init_listhead(&psta->hash_list); /* _rtw_init_listhead(&psta->asoc_list); */ @@ -110,7 +110,7 @@ u32 _rtw_init_sta_priv(struct sta_priv *pstapriv) _rtw_init_queue(&pstapriv->free_sta_queue); - _rtw_spinlock_init(&pstapriv->sta_hash_lock); + spin_lock_init(&pstapriv->sta_hash_lock); /* _rtw_init_queue(&pstapriv->asoc_q); */ pstapriv->asoc_sta_count = 0; @@ -140,8 +140,8 @@ u32 _rtw_init_sta_priv(struct sta_priv *pstapriv) _rtw_init_listhead(&pstapriv->asoc_list); _rtw_init_listhead(&pstapriv->auth_list); - _rtw_spinlock_init(&pstapriv->asoc_list_lock); - _rtw_spinlock_init(&pstapriv->auth_list_lock); + spin_lock_init(&pstapriv->asoc_list_lock); + spin_lock_init(&pstapriv->auth_list_lock); pstapriv->asoc_list_cnt = 0; pstapriv->auth_list_cnt = 0; diff --git a/core/rtw_xmit.c b/core/rtw_xmit.c index 46388ec..91e4fc1 100755 --- a/core/rtw_xmit.c +++ b/core/rtw_xmit.c @@ -50,7 +50,7 @@ void _rtw_init_sta_xmit_priv(struct sta_xmit_priv *psta_xmitpriv) memset((unsigned char *)psta_xmitpriv, 0, sizeof (struct sta_xmit_priv)); - _rtw_spinlock_init(&psta_xmitpriv->lock); + spin_lock_init(&psta_xmitpriv->lock); /* for(i = 0 ; i < MAX_NUMBLKS; i++) */ /* _init_txservq(&(psta_xmitpriv->blk_q[i])); */ @@ -80,8 +80,8 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) /* We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). */ /* memset((unsigned char *)pxmitpriv, 0, sizeof(struct xmit_priv)); */ - _rtw_spinlock_init(&pxmitpriv->lock); - _rtw_spinlock_init(&pxmitpriv->lock_sctx); + spin_lock_init(&pxmitpriv->lock); + spin_lock_init(&pxmitpriv->lock_sctx); _rtw_init_sema(&pxmitpriv->xmit_sema, 0); _rtw_init_sema(&pxmitpriv->terminate_xmitthread_sema, 0); @@ -2514,7 +2514,7 @@ void rtw_init_hwxmits(struct hw_xmit *phwxmit, sint entry) ; for(i = 0; i < entry; i++, phwxmit++) { - /* _rtw_spinlock_init(&phwxmit->xmit_lock); */ + /* spin_lock_init(&phwxmit->xmit_lock); */ /* _rtw_init_listhead(&phwxmit->pending); */ /* phwxmit->txcmdcnt = 0; */ phwxmit->accnt = 0; diff --git a/hal/rtl8188e_dm.c b/hal/rtl8188e_dm.c index 559680b..286bc5b 100755 --- a/hal/rtl8188e_dm.c +++ b/hal/rtl8188e_dm.c @@ -361,7 +361,7 @@ void rtl8188e_init_dm_priv(IN struct adapter *Adapter) struct dm_priv *pdmpriv = &pHalData->dmpriv; PDM_ODM_T podmpriv = &pHalData->odmpriv; memset(pdmpriv, 0, sizeof(struct dm_priv)); - /* _rtw_spinlock_init(&(pHalData->odm_stainfo_lock)); */ + /* spin_lock_init(&(pHalData->odm_stainfo_lock)); */ Init_ODM_ComInfo_88E(Adapter); ODM_InitDebugSetting(podmpriv); } diff --git a/hal/rtl8188eu_recv.c b/hal/rtl8188eu_recv.c index 52319f3..59be2f2 100755 --- a/hal/rtl8188eu_recv.c +++ b/hal/rtl8188eu_recv.c @@ -100,7 +100,7 @@ int rtl8188eu_init_recv_priv(struct adapter *padapter) for(i=0; i < NR_RECVBUFF ; i++) { _rtw_init_listhead(&precvbuf->list); - _rtw_spinlock_init(&precvbuf->recvbuf_lock); + spin_lock_init(&precvbuf->recvbuf_lock); precvbuf->alloc_sz = MAX_RECVBUF_SZ; diff --git a/include/osdep_service.h b/include/osdep_service.h index 09d509a..d224545 100755 --- a/include/osdep_service.h +++ b/include/osdep_service.h @@ -575,7 +575,6 @@ void _rtw_up_sema(_sema *sema); u32 _rtw_down_sema(_sema *sema); void _rtw_mutex_init(_mutex *pmutex); void _rtw_mutex_free(_mutex *pmutex); -void _rtw_spinlock_init(_lock *plock); void _rtw_spinlock_free(_lock *plock); void _rtw_init_queue(_queue *pqueue); diff --git a/os_dep/ioctl_cfg80211.c b/os_dep/ioctl_cfg80211.c index 7b1c798..ae18f8c 100755 --- a/os_dep/ioctl_cfg80211.c +++ b/os_dep/ioctl_cfg80211.c @@ -5100,7 +5100,7 @@ int rtw_wdev_alloc(struct adapter *padapter, struct device *dev) pwdev_priv->ifname_mon[0] = '\0'; pwdev_priv->padapter = padapter; pwdev_priv->scan_request = NULL; - _rtw_spinlock_init(&pwdev_priv->scan_req_lock); + spin_lock_init(&pwdev_priv->scan_req_lock); pwdev_priv->p2p_enabled = false; pwdev_priv->provdisc_req_issued = false; diff --git a/os_dep/os_intfs.c b/os_dep/os_intfs.c index a0258d0..afdada3 100755 --- a/os_dep/os_intfs.c +++ b/os_dep/os_intfs.c @@ -898,7 +898,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter) goto exit; } /* add for CONFIG_IEEE80211W, none 11w also can use */ - _rtw_spinlock_init(&padapter->security_key_mutex); + spin_lock_init(&padapter->security_key_mutex); /* We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). */ /* memset((unsigned char *)&padapter->securitypriv, 0, sizeof (struct security_priv)); */ @@ -929,7 +929,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter) #endif #ifdef CONFIG_BR_EXT - _rtw_spinlock_init(&padapter->br_ext_lock); + spin_lock_init(&padapter->br_ext_lock); #endif /* CONFIG_BR_EXT */ exit: diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index 002358e..b644f28 100755 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -656,11 +656,6 @@ void _rtw_mutex_free(_mutex *pmutex) #endif } -void _rtw_spinlock_init(_lock *plock) -{ - spin_lock_init(plock); -} - void _rtw_spinlock_free(_lock *plock) { } @@ -670,7 +665,7 @@ void _rtw_init_queue(_queue *pqueue) _rtw_init_listhead(&(pqueue->queue)); - _rtw_spinlock_init(&(pqueue->lock)); + spin_lock_init(&(pqueue->lock)); }