mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-06-23 08:34:20 +00:00
rtl8188eu: Convert typedef for _adapter, etc.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
parent
e8012b9521
commit
2bd2f4b4c8
99 changed files with 2239 additions and 2251 deletions
|
@ -219,7 +219,7 @@ void rtw_proc_init_one(struct net_device *dev)
|
|||
{
|
||||
struct proc_dir_entry *dir_dev = NULL;
|
||||
struct proc_dir_entry *entry=NULL;
|
||||
_adapter *padapter = rtw_netdev_priv(dev);
|
||||
struct adapter *padapter = rtw_netdev_priv(dev);
|
||||
u8 rf_type;
|
||||
|
||||
if (rtw_proc == NULL) {
|
||||
|
@ -335,7 +335,7 @@ void rtw_proc_init_one(struct net_device *dev)
|
|||
}
|
||||
|
||||
entry = create_proc_read_entry("adapter_state", S_IFREG | S_IRUGO,
|
||||
dir_dev, proc_get_adapter_state, dev);
|
||||
dir_dev, proc_getstruct adapter_state, dev);
|
||||
if (!entry) {
|
||||
pr_info("Unable to create_proc_read_entry!\n");
|
||||
return;
|
||||
|
@ -506,7 +506,7 @@ void rtw_proc_init_one(struct net_device *dev)
|
|||
void rtw_proc_remove_one(struct net_device *dev)
|
||||
{
|
||||
struct proc_dir_entry *dir_dev = NULL;
|
||||
_adapter *padapter = rtw_netdev_priv(dev);
|
||||
struct adapter *padapter = rtw_netdev_priv(dev);
|
||||
u8 rf_type;
|
||||
|
||||
dir_dev = padapter->dir_dev;
|
||||
|
@ -576,7 +576,7 @@ void rtw_proc_remove_one(struct net_device *dev)
|
|||
}
|
||||
#endif
|
||||
|
||||
static uint loadparam( _adapter *padapter, struct net_device *pnetdev)
|
||||
static uint loadparam( struct adapter *padapter, struct net_device *pnetdev)
|
||||
{
|
||||
|
||||
uint status = _SUCCESS;
|
||||
|
@ -664,7 +664,7 @@ _func_exit_;
|
|||
|
||||
static int rtw_net_set_mac_address(struct net_device *pnetdev, void *p)
|
||||
{
|
||||
_adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev);
|
||||
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
|
||||
struct sockaddr *addr = p;
|
||||
|
||||
if (padapter->bup == false)
|
||||
|
@ -675,7 +675,7 @@ static int rtw_net_set_mac_address(struct net_device *pnetdev, void *p)
|
|||
|
||||
static struct net_device_stats *rtw_net_get_stats(struct net_device *pnetdev)
|
||||
{
|
||||
_adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev);
|
||||
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
|
||||
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
|
||||
struct recv_priv *precvpriv = &(padapter->recvpriv);
|
||||
|
||||
|
@ -725,7 +725,7 @@ static unsigned int rtw_classify8021d(struct sk_buff *skb)
|
|||
|
||||
static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb)
|
||||
{
|
||||
_adapter *padapter = rtw_netdev_priv(dev);
|
||||
struct adapter *padapter = rtw_netdev_priv(dev);
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
|
||||
skb->priority = rtw_classify8021d(skb);
|
||||
|
@ -777,7 +777,7 @@ static const struct net_device_ops rtw_netdev_ops = {
|
|||
|
||||
int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname)
|
||||
{
|
||||
_adapter *padapter = rtw_netdev_priv(pnetdev);
|
||||
struct adapter *padapter = rtw_netdev_priv(pnetdev);
|
||||
|
||||
if (dev_alloc_name(pnetdev, ifname) < 0)
|
||||
RT_TRACE(_module_os_intfs_c_,_drv_err_,("dev_alloc_name, fail!\n"));
|
||||
|
@ -786,17 +786,17 @@ int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname)
|
|||
return 0;
|
||||
}
|
||||
|
||||
struct net_device *rtw_init_netdev(_adapter *old_padapter)
|
||||
struct net_device *rtw_init_netdev(struct adapter *old_padapter)
|
||||
{
|
||||
_adapter *padapter;
|
||||
struct adapter *padapter;
|
||||
struct net_device *pnetdev;
|
||||
|
||||
RT_TRACE(_module_os_intfs_c_,_drv_info_,("+init_net_dev\n"));
|
||||
|
||||
if (old_padapter != NULL)
|
||||
pnetdev = rtw_alloc_etherdev_with_old_priv(sizeof(_adapter), (void *)old_padapter);
|
||||
pnetdev = rtw_alloc_etherdev_with_old_priv(sizeof(struct adapter), (void *)old_padapter);
|
||||
else
|
||||
pnetdev = rtw_alloc_etherdev(sizeof(_adapter));
|
||||
pnetdev = rtw_alloc_etherdev(sizeof(struct adapter));
|
||||
|
||||
if (!pnetdev)
|
||||
return NULL;
|
||||
|
@ -830,7 +830,7 @@ struct net_device *rtw_init_netdev(_adapter *old_padapter)
|
|||
return pnetdev;
|
||||
}
|
||||
|
||||
u32 rtw_start_drv_threads(_adapter *padapter)
|
||||
u32 rtw_start_drv_threads(struct adapter *padapter)
|
||||
{
|
||||
u32 _status = _SUCCESS;
|
||||
|
||||
|
@ -846,7 +846,7 @@ u32 rtw_start_drv_threads(_adapter *padapter)
|
|||
return _status;
|
||||
}
|
||||
|
||||
void rtw_stop_drv_threads (_adapter *padapter)
|
||||
void rtw_stop_drv_threads (struct adapter *padapter)
|
||||
{
|
||||
RT_TRACE(_module_os_intfs_c_,_drv_info_,("+rtw_stop_drv_threads\n"));
|
||||
|
||||
|
@ -858,7 +858,7 @@ void rtw_stop_drv_threads (_adapter *padapter)
|
|||
rtw_hal_stop_thread(padapter);
|
||||
}
|
||||
|
||||
static u8 rtw_init_default_value(_adapter *padapter)
|
||||
static u8 rtw_init_default_value(struct adapter *padapter)
|
||||
{
|
||||
u8 ret = _SUCCESS;
|
||||
struct registry_priv* pregistrypriv = &padapter->registrypriv;
|
||||
|
@ -911,7 +911,7 @@ static u8 rtw_init_default_value(_adapter *padapter)
|
|||
return ret;
|
||||
}
|
||||
|
||||
u8 rtw_reset_drv_sw(_adapter *padapter)
|
||||
u8 rtw_reset_drv_sw(struct adapter *padapter)
|
||||
{
|
||||
u8 ret8=_SUCCESS;
|
||||
struct mlme_priv *pmlmepriv= &padapter->mlmepriv;
|
||||
|
@ -942,7 +942,7 @@ u8 rtw_reset_drv_sw(_adapter *padapter)
|
|||
return ret8;
|
||||
}
|
||||
|
||||
u8 rtw_init_drv_sw(_adapter *padapter)
|
||||
u8 rtw_init_drv_sw(struct adapter *padapter)
|
||||
{
|
||||
u8 ret8=_SUCCESS;
|
||||
|
||||
|
@ -1027,14 +1027,14 @@ exit:
|
|||
}
|
||||
|
||||
#ifdef CONFIG_WOWLAN
|
||||
void rtw_cancel_dynamic_chk_timer(_adapter *padapter)
|
||||
void rtw_cancel_dynamic_chk_timer(struct adapter *padapter)
|
||||
{
|
||||
_cancel_timer_ex(&padapter->mlmepriv.dynamic_chk_timer);
|
||||
RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel dynamic_chk_timer!\n"));
|
||||
}
|
||||
#endif
|
||||
|
||||
void rtw_cancel_all_timer(_adapter *padapter)
|
||||
void rtw_cancel_all_timer(struct adapter *padapter)
|
||||
{
|
||||
RT_TRACE(_module_os_intfs_c_,_drv_info_,("+rtw_cancel_all_timer\n"));
|
||||
|
||||
|
@ -1062,7 +1062,7 @@ void rtw_cancel_all_timer(_adapter *padapter)
|
|||
rtw_hal_dm_deinit(padapter);
|
||||
}
|
||||
|
||||
u8 rtw_free_drv_sw(_adapter *padapter)
|
||||
u8 rtw_free_drv_sw(struct adapter *padapter)
|
||||
{
|
||||
struct net_device *pnetdev = (struct net_device*)padapter->pnetdev;
|
||||
|
||||
|
@ -1115,10 +1115,9 @@ u8 rtw_free_drv_sw(_adapter *padapter)
|
|||
padapter->rereg_nd_name_priv.old_pnetdev = NULL;
|
||||
}
|
||||
|
||||
// clear pbuddy_adapter to avoid access wrong pointer.
|
||||
if (padapter->pbuddy_adapter != NULL) {
|
||||
// clear pbuddystruct adapter to avoid access wrong pointer.
|
||||
if (padapter->pbuddy_adapter != NULL)
|
||||
padapter->pbuddy_adapter->pbuddy_adapter = NULL;
|
||||
}
|
||||
|
||||
RT_TRACE(_module_os_intfs_c_,_drv_info_,("-rtw_free_drv_sw\n"));
|
||||
|
||||
|
@ -1127,7 +1126,7 @@ u8 rtw_free_drv_sw(_adapter *padapter)
|
|||
|
||||
void netdev_br_init(struct net_device *netdev)
|
||||
{
|
||||
_adapter *adapter = (_adapter *)rtw_netdev_priv(netdev);
|
||||
struct adapter *adapter = (struct adapter *)rtw_netdev_priv(netdev);
|
||||
|
||||
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35))
|
||||
rcu_read_lock();
|
||||
|
@ -1173,7 +1172,7 @@ void netdev_br_init(struct net_device *netdev)
|
|||
int _netdev_open(struct net_device *pnetdev)
|
||||
{
|
||||
uint status;
|
||||
_adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev);
|
||||
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
|
||||
struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;
|
||||
|
||||
RT_TRACE(_module_os_intfs_c_,_drv_info_,("+88eu_drv - dev_open\n"));
|
||||
|
@ -1252,7 +1251,7 @@ netdev_open_error:
|
|||
int netdev_open(struct net_device *pnetdev)
|
||||
{
|
||||
int ret;
|
||||
_adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev);
|
||||
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
|
||||
|
||||
_enter_critical_mutex(padapter->hw_init_mutex, NULL);
|
||||
ret = _netdev_open(pnetdev);
|
||||
|
@ -1261,7 +1260,7 @@ int netdev_open(struct net_device *pnetdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int ips_netdrv_open(_adapter *padapter)
|
||||
static int ips_netdrv_open(struct adapter *padapter)
|
||||
{
|
||||
int status = _SUCCESS;
|
||||
padapter->net_closed = false;
|
||||
|
@ -1292,7 +1291,7 @@ netdev_open_error:
|
|||
}
|
||||
|
||||
|
||||
int rtw_ips_pwr_up(_adapter *padapter)
|
||||
int rtw_ips_pwr_up(struct adapter *padapter)
|
||||
{
|
||||
int result;
|
||||
u32 start_time = rtw_get_current_time();
|
||||
|
@ -1307,7 +1306,7 @@ int rtw_ips_pwr_up(_adapter *padapter)
|
|||
return result;
|
||||
}
|
||||
|
||||
void rtw_ips_pwr_down(_adapter *padapter)
|
||||
void rtw_ips_pwr_down(struct adapter *padapter)
|
||||
{
|
||||
u32 start_time = rtw_get_current_time();
|
||||
DBG_88E("===> rtw_ips_pwr_down...................\n");
|
||||
|
@ -1322,7 +1321,7 @@ void rtw_ips_pwr_down(_adapter *padapter)
|
|||
DBG_88E("<=== rtw_ips_pwr_down..................... in %dms\n", rtw_get_passing_time_ms(start_time));
|
||||
}
|
||||
|
||||
void rtw_ips_dev_unload(_adapter *padapter)
|
||||
void rtw_ips_dev_unload(struct adapter *padapter)
|
||||
{
|
||||
struct net_device *pnetdev= (struct net_device*)padapter->pnetdev;
|
||||
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
|
||||
|
@ -1345,13 +1344,13 @@ int pm_netdev_open(struct net_device *pnetdev,u8 bnormal)
|
|||
if (true == bnormal)
|
||||
status = netdev_open(pnetdev);
|
||||
else
|
||||
status = (_SUCCESS == ips_netdrv_open((_adapter *)rtw_netdev_priv(pnetdev)))?(0):(-1);
|
||||
status = (_SUCCESS == ips_netdrv_open((struct adapter *)rtw_netdev_priv(pnetdev)))?(0):(-1);
|
||||
return status;
|
||||
}
|
||||
|
||||
static int netdev_close(struct net_device *pnetdev)
|
||||
{
|
||||
_adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev);
|
||||
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
|
||||
|
||||
RT_TRACE(_module_os_intfs_c_,_drv_info_,("+88eu_drv - drv_close\n"));
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue