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

rtl8192eu: Replace typedefs for struct adapter

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2014-12-17 17:13:53 -06:00
parent a8b7b4d54c
commit 202d20077c
140 changed files with 3132 additions and 7948 deletions
Download patch file Download diff file Expand all files Collapse all files

96
os_dep/ioctl_cfg80211.c
View file

@ -341,7 +341,7 @@ static int rtw_ieee80211_channel_to_frequency(int chan, int band)
}
#define MAX_BSSINFO_LEN 1000
struct cfg80211_bss *rtw_cfg80211_inform_bss(_adapter *padapter, struct wlan_network *pnetwork)
struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wlan_network *pnetwork)
{
struct ieee80211_channel *notify_channel;
struct cfg80211_bss *bss = NULL;
@ -581,7 +581,7 @@ exit:
return _TRUE if bss is valid, _FALSE for not found.
*/
int rtw_cfg80211_check_bss(_adapter *padapter)
int rtw_cfg80211_check_bss(struct adapter *padapter)
{
WLAN_BSSID_EX *pnetwork = &(padapter->mlmeextpriv.mlmext_info.network);
struct cfg80211_bss *bss = NULL;
@ -605,7 +605,7 @@ int rtw_cfg80211_check_bss(_adapter *padapter)
return (bss!=NULL);
}
void rtw_cfg80211_ibss_indicate_connect(_adapter *padapter)
void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter)
{
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wlan_network *cur_network = &(pmlmepriv->cur_network);
@ -665,7 +665,7 @@ void rtw_cfg80211_ibss_indicate_connect(_adapter *padapter)
cfg80211_ibss_joined(padapter->pnetdev, cur_network->network.MacAddress, GFP_ATOMIC);
}
void rtw_cfg80211_indicate_connect(_adapter *padapter)
void rtw_cfg80211_indicate_connect(struct adapter *padapter)
{
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wlan_network *cur_network = &(pmlmepriv->cur_network);
@ -774,7 +774,7 @@ check_bss:
}
}
void rtw_cfg80211_indicate_disconnect(_adapter *padapter)
void rtw_cfg80211_indicate_disconnect(struct adapter *padapter)
{
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wireless_dev *pwdev = padapter->rtw_wdev;
@ -825,7 +825,7 @@ void rtw_cfg80211_indicate_disconnect(_adapter *padapter)
#ifdef CONFIG_AP_MODE
static u8 set_pairwise_key(_adapter *padapter, struct sta_info *psta)
static u8 set_pairwise_key(struct adapter *padapter, struct sta_info *psta)
{
struct cmd_obj* ph2c;
struct set_stakey_parm *psetstakey_para;
@ -863,7 +863,7 @@ exit:
}
static int set_group_key(_adapter *padapter, u8 *key, u8 alg, int keyid)
static int set_group_key(struct adapter *padapter, u8 *key, u8 alg, int keyid)
{
u8 keylen;
struct cmd_obj* pcmd;
@ -931,7 +931,7 @@ exit:
}
static int set_wep_key(_adapter *padapter, u8 *key, u8 keylen, int keyid)
static int set_wep_key(struct adapter *padapter, u8 *key, u8 keylen, int keyid)
{
u8 alg;
@ -956,7 +956,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa
int ret = 0;
u32 wep_key_idx, wep_key_len,wep_total_len;
struct sta_info *psta = NULL, *pbcmc_sta = NULL;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct security_priv* psecuritypriv=&(padapter->securitypriv);
struct sta_priv *pstapriv = &padapter->stapriv;
@ -1244,7 +1244,7 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param
{
int ret = 0;
u32 wep_key_idx, wep_key_len,wep_total_len;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct security_priv *psecuritypriv = &padapter->securitypriv;
#ifdef CONFIG_P2P
@ -1541,7 +1541,7 @@ static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev,
struct ieee_param *param = NULL;
int ret=0;
struct wireless_dev *rtw_wdev = wiphy_to_wdev(wiphy);
_adapter *padapter = wiphy_to_adapter(wiphy);
struct adapter *padapter = wiphy_to_adapter(wiphy);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
DBG_871X(FUNC_NDEV_FMT" adding key for %pM\n", FUNC_NDEV_ARG(ndev), mac_addr);
@ -1699,7 +1699,7 @@ static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev,
u8 key_index, const u8 *mac_addr)
#endif // (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
{
_adapter *padapter = (_adapter *)rtw_netdev_priv(ndev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(ndev);
struct security_priv *psecuritypriv = &padapter->securitypriv;
DBG_871X(FUNC_NDEV_FMT" key_index=%d\n", FUNC_NDEV_ARG(ndev), key_index);
@ -1720,7 +1720,7 @@ static int cfg80211_rtw_set_default_key(struct wiphy *wiphy,
#endif
)
{
_adapter *padapter = (_adapter *)rtw_netdev_priv(ndev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(ndev);
struct security_priv *psecuritypriv = &padapter->securitypriv;
DBG_871X(FUNC_NDEV_FMT" key_index=%d"
@ -1759,7 +1759,7 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy,
u8 *mac, struct station_info *sinfo)
{
int ret = 0;
_adapter *padapter = wiphy_to_adapter(wiphy);
struct adapter *padapter = wiphy_to_adapter(wiphy);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct sta_info *psta = NULL;
struct sta_priv *pstapriv = &padapter->stapriv;
@ -1853,7 +1853,7 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
{
enum nl80211_iftype old_type;
NDIS_802_11_NETWORK_INFRASTRUCTURE networkType ;
_adapter *padapter = wiphy_to_adapter(wiphy);
struct adapter *padapter = wiphy_to_adapter(wiphy);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct wireless_dev *rtw_wdev = wiphy_to_wdev(wiphy);
#ifdef CONFIG_P2P
@ -1999,7 +1999,7 @@ void rtw_cfg80211_indicate_scan_done(struct rtw_wdev_priv *pwdev_priv, bool abor
_exit_critical_bh(&pwdev_priv->scan_req_lock, &irqL);
}
void rtw_cfg80211_surveydone_event_callback(_adapter *padapter)
void rtw_cfg80211_surveydone_event_callback(struct adapter *padapter)
{
_irqL irqL;
_list *plist, *phead;
@ -2049,7 +2049,7 @@ void rtw_cfg80211_surveydone_event_callback(_adapter *padapter)
rtw_cfg80211_indicate_scan_done(wdev_to_priv(padapter->rtw_wdev), _FALSE);
}
static int rtw_cfg80211_set_probe_req_wpsp2pie(_adapter *padapter, char *buf, int len)
static int rtw_cfg80211_set_probe_req_wpsp2pie(struct adapter *padapter, char *buf, int len)
{
int ret = 0;
uint wps_ielen = 0;
@ -2177,7 +2177,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
int i;
u8 _status = _FALSE;
int ret = 0;
_adapter *padapter = wiphy_to_adapter(wiphy);
struct adapter *padapter = wiphy_to_adapter(wiphy);
struct mlme_priv *pmlmepriv= &padapter->mlmepriv;
NDIS_802_11_SSID ssid[RTW_SSID_SCAN_AMOUNT];
struct rtw_ieee80211_channel ch[RTW_CHANNEL_SCAN_AMOUNT];
@ -2595,7 +2595,7 @@ static int rtw_cfg80211_set_key_mgt(struct security_priv *psecuritypriv, u32 key
return 0;
}
static int rtw_cfg80211_set_wpa_ie(_adapter *padapter, u8 *pie, size_t ielen)
static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t ielen)
{
u8 *buf=NULL, *pos=NULL;
u32 left;
@ -2822,7 +2822,7 @@ exit:
static int cfg80211_rtw_join_ibss(struct wiphy *wiphy, struct net_device *ndev,
struct cfg80211_ibss_params *params)
{
_adapter *padapter = wiphy_to_adapter(wiphy);
struct adapter *padapter = wiphy_to_adapter(wiphy);
NDIS_802_11_SSID ndis_ssid;
struct security_priv *psecuritypriv = &padapter->securitypriv;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -2912,7 +2912,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
//u8 matched_by_bssid=_FALSE;
//u8 matched_by_ssid=_FALSE;
u8 matched=_FALSE;
_adapter *padapter = wiphy_to_adapter(wiphy);
struct adapter *padapter = wiphy_to_adapter(wiphy);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct security_priv *psecuritypriv = &padapter->securitypriv;
_queue *queue = &pmlmepriv->scanned_queue;
@ -3151,7 +3151,7 @@ exit:
static int cfg80211_rtw_disconnect(struct wiphy *wiphy, struct net_device *ndev,
u16 reason_code)
{
_adapter *padapter = wiphy_to_adapter(wiphy);
struct adapter *padapter = wiphy_to_adapter(wiphy);
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
@ -3223,7 +3223,7 @@ static int cfg80211_rtw_get_txpower(struct wiphy *wiphy,
#endif
int *dbm)
{
//_adapter *padapter = wiphy_to_adapter(wiphy);
//struct adapter *padapter = wiphy_to_adapter(wiphy);
DBG_8192C("%s\n", __func__);
@ -3232,7 +3232,7 @@ static int cfg80211_rtw_get_txpower(struct wiphy *wiphy,
return 0;
}
inline bool rtw_cfg80211_pwr_mgmt(_adapter *adapter)
inline bool rtw_cfg80211_pwr_mgmt(struct adapter *adapter)
{
struct rtw_wdev_priv *rtw_wdev_priv = wdev_to_priv(adapter->rtw_wdev);
return rtw_wdev_priv->power_mgmt;
@ -3242,7 +3242,7 @@ static int cfg80211_rtw_set_power_mgmt(struct wiphy *wiphy,
struct net_device *ndev,
bool enabled, int timeout)
{
_adapter *padapter = wiphy_to_adapter(wiphy);
struct adapter *padapter = wiphy_to_adapter(wiphy);
struct rtw_wdev_priv *rtw_wdev_priv = wdev_to_priv(padapter->rtw_wdev);
DBG_871X(FUNC_NDEV_FMT" enabled:%u, timeout:%d\n", FUNC_NDEV_ARG(ndev),
@ -3263,7 +3263,7 @@ static int cfg80211_rtw_set_pmksa(struct wiphy *wiphy,
struct cfg80211_pmksa *pmksa)
{
u8 index,blInserted = _FALSE;
_adapter *padapter = wiphy_to_adapter(wiphy);
struct adapter *padapter = wiphy_to_adapter(wiphy);
struct security_priv *psecuritypriv = &padapter->securitypriv;
u8 strZeroMacAddress[ ETH_ALEN ] = { 0x00 };
@ -3316,7 +3316,7 @@ static int cfg80211_rtw_del_pmksa(struct wiphy *wiphy,
struct cfg80211_pmksa *pmksa)
{
u8 index, bMatched = _FALSE;
_adapter *padapter = wiphy_to_adapter(wiphy);
struct adapter *padapter = wiphy_to_adapter(wiphy);
struct security_priv *psecuritypriv = &padapter->securitypriv;
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(netdev));
@ -3346,7 +3346,7 @@ static int cfg80211_rtw_del_pmksa(struct wiphy *wiphy,
static int cfg80211_rtw_flush_pmksa(struct wiphy *wiphy,
struct net_device *netdev)
{
_adapter *padapter = wiphy_to_adapter(wiphy);
struct adapter *padapter = wiphy_to_adapter(wiphy);
struct security_priv *psecuritypriv = &padapter->securitypriv;
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(netdev));
@ -3358,7 +3358,7 @@ static int cfg80211_rtw_flush_pmksa(struct wiphy *wiphy,
}
#ifdef CONFIG_AP_MODE
void rtw_cfg80211_indicate_sta_assoc(_adapter *padapter, u8 *pmgmt_frame, uint frame_len)
void rtw_cfg80211_indicate_sta_assoc(struct adapter *padapter, u8 *pmgmt_frame, uint frame_len)
{
s32 freq;
int channel;
@ -3411,7 +3411,7 @@ void rtw_cfg80211_indicate_sta_assoc(_adapter *padapter, u8 *pmgmt_frame, uint f
}
void rtw_cfg80211_indicate_sta_disassoc(_adapter *padapter, unsigned char *da, unsigned short reason)
void rtw_cfg80211_indicate_sta_disassoc(struct adapter *padapter, unsigned char *da, unsigned short reason)
{
s32 freq;
int channel;
@ -3499,7 +3499,7 @@ static int rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struct net_de
unsigned char dst_mac_addr[6];
struct ieee80211_hdr *dot11_hdr;
struct ieee80211_radiotap_header *rtap_hdr;
_adapter *padapter = (_adapter *)rtw_netdev_priv(ndev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(ndev);
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
@ -3676,7 +3676,7 @@ static const struct net_device_ops rtw_cfg80211_monitor_if_ops = {
};
#endif
static int rtw_cfg80211_add_monitor_if(_adapter *padapter, char *name, struct net_device **ndev)
static int rtw_cfg80211_add_monitor_if(struct adapter *padapter, char *name, struct net_device **ndev)
{
int ret = 0;
struct net_device* mon_ndev = NULL;
@ -3720,7 +3720,7 @@ static int rtw_cfg80211_add_monitor_if(_adapter *padapter, char *name, struct ne
pnpi = netdev_priv(mon_ndev);
pnpi->priv = padapter;
pnpi->sizeof_priv = sizeof(_adapter);
pnpi->sizeof_priv = sizeof(struct adapter);
/* wdev */
mon_wdev = (struct wireless_dev *)rtw_zmalloc(sizeof(struct wireless_dev));
@ -3775,7 +3775,7 @@ static int
{
int ret = 0;
struct net_device* ndev = NULL;
_adapter *padapter = wiphy_to_adapter(wiphy);
struct adapter *padapter = wiphy_to_adapter(wiphy);
DBG_871X(FUNC_ADPT_FMT " wiphy:%s, name:%s, type:%d\n",
FUNC_ADPT_ARG(padapter), wiphy_name(wiphy), name, type);
@ -3850,7 +3850,7 @@ exit:
return 0;
}
static int rtw_add_beacon(_adapter *adapter, const u8 *head, size_t head_len, const u8 *tail, size_t tail_len)
static int rtw_add_beacon(struct adapter *adapter, const u8 *head, size_t head_len, const u8 *tail, size_t tail_len)
{
int ret=0;
u8 *pbuf = NULL;
@ -3956,7 +3956,7 @@ static int cfg80211_rtw_add_beacon(struct wiphy *wiphy, struct net_device *ndev,
struct beacon_parameters *info)
{
int ret=0;
_adapter *adapter = wiphy_to_adapter(wiphy);
struct adapter *adapter = wiphy_to_adapter(wiphy);
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
ret = rtw_add_beacon(adapter, info->head, info->head_len, info->tail, info->tail_len);
@ -3967,7 +3967,7 @@ static int cfg80211_rtw_add_beacon(struct wiphy *wiphy, struct net_device *ndev,
static int cfg80211_rtw_set_beacon(struct wiphy *wiphy, struct net_device *ndev,
struct beacon_parameters *info)
{
_adapter *padapter = wiphy_to_adapter(wiphy);
struct adapter *padapter = wiphy_to_adapter(wiphy);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
@ -3990,7 +3990,7 @@ static int cfg80211_rtw_start_ap(struct wiphy *wiphy, struct net_device *ndev,
struct cfg80211_ap_settings *settings)
{
int ret = 0;
_adapter *adapter = wiphy_to_adapter(wiphy);
struct adapter *adapter = wiphy_to_adapter(wiphy);
DBG_871X(FUNC_NDEV_FMT" hidden_ssid:%d, auth_type:%d\n", FUNC_NDEV_ARG(ndev),
settings->hidden_ssid, settings->auth_type);
@ -4027,7 +4027,7 @@ static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *nd
struct cfg80211_beacon_data *info)
{
int ret = 0;
_adapter *adapter = wiphy_to_adapter(wiphy);
struct adapter *adapter = wiphy_to_adapter(wiphy);
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
@ -4060,7 +4060,7 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev
_list *phead, *plist;
u8 updated;
struct sta_info *psta = NULL;
_adapter *padapter = (_adapter *)rtw_netdev_priv(ndev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(ndev);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct sta_priv *pstapriv = &padapter->stapriv;
@ -4214,7 +4214,7 @@ static int cfg80211_rtw_assoc(struct wiphy *wiphy, struct net_device *ndev,
}
#endif //CONFIG_AP_MODE
void rtw_cfg80211_rx_action_p2p(_adapter *padapter, u8 *pmgmt_frame, uint frame_len)
void rtw_cfg80211_rx_action_p2p(struct adapter *padapter, u8 *pmgmt_frame, uint frame_len)
{
int type;
s32 freq;
@ -4246,7 +4246,7 @@ indicate:
#endif
}
void rtw_cfg80211_rx_p2p_action_public(_adapter *padapter, u8 *pmgmt_frame, uint frame_len)
void rtw_cfg80211_rx_p2p_action_public(struct adapter *padapter, u8 *pmgmt_frame, uint frame_len)
{
int type;
s32 freq;
@ -4286,7 +4286,7 @@ indicate:
#endif
}
void rtw_cfg80211_rx_action(_adapter *adapter, u8 *frame, uint frame_len, const char*msg)
void rtw_cfg80211_rx_action(struct adapter *adapter, u8 *frame, uint frame_len, const char*msg)
{
s32 freq;
int channel;
@ -4318,7 +4318,7 @@ void rtw_cfg80211_rx_action(_adapter *adapter, u8 *frame, uint frame_len, const
}
#ifdef CONFIG_P2P
void rtw_cfg80211_issue_p2p_provision_request(_adapter *padapter, const u8 *buf, size_t len)
void rtw_cfg80211_issue_p2p_provision_request(struct adapter *padapter, const u8 *buf, size_t len)
{
u16 wps_devicepassword_id = 0x0000;
uint wps_devicepassword_id_len = 0;
@ -4556,7 +4556,7 @@ static s32 cfg80211_rtw_remain_on_channel(struct wiphy *wiphy,
unsigned int duration, u64 *cookie)
{
s32 err = 0;
_adapter *padapter = wiphy_to_adapter(wiphy);
struct adapter *padapter = wiphy_to_adapter(wiphy);
struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev);
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
@ -4713,7 +4713,7 @@ static s32 cfg80211_rtw_cancel_remain_on_channel(struct wiphy *wiphy,
u64 cookie)
{
s32 err = 0;
_adapter *padapter = wiphy_to_adapter(wiphy);
struct adapter *padapter = wiphy_to_adapter(wiphy);
struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev);
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &padapter->cfg80211_wdinfo;
@ -4754,7 +4754,7 @@ static s32 cfg80211_rtw_cancel_remain_on_channel(struct wiphy *wiphy,
#endif //CONFIG_P2P
static int _cfg80211_rtw_mgmt_tx(_adapter *padapter, u8 tx_ch, const u8 *buf, size_t len)
static int _cfg80211_rtw_mgmt_tx(struct adapter *padapter, u8 tx_ch, const u8 *buf, size_t len)
{
struct xmit_frame *pmgntframe;
struct pkt_attrib *pattrib;
@ -4941,7 +4941,7 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy,
#endif
u64 *cookie)
{
_adapter *padapter = (_adapter *)wiphy_to_adapter(wiphy);
struct adapter *padapter = (struct adapter *)wiphy_to_adapter(wiphy);
struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev);
int ret = 0;
int tx_ret;

330
os_dep/ioctl_linux.c
View file

File diff suppressed because it is too large Load diff

58
os_dep/mlme_linux.c
View file

@ -31,7 +31,7 @@
void Linkup_workitem_callback(struct work_struct *work)
{
struct mlme_priv *pmlmepriv = container_of(work, struct mlme_priv, Linkup_workitem);
_adapter *padapter = container_of(pmlmepriv, _adapter, mlmepriv);
struct adapter *padapter = container_of(pmlmepriv, struct adapter, mlmepriv);
_func_enter_;
@ -49,7 +49,7 @@ _func_exit_;
void Linkdown_workitem_callback(struct work_struct *work)
{
struct mlme_priv *pmlmepriv = container_of(work, struct mlme_priv, Linkdown_workitem);
_adapter *padapter = container_of(pmlmepriv, _adapter, mlmepriv);
struct adapter *padapter = container_of(pmlmepriv, struct adapter, mlmepriv);
_func_enter_;
@ -69,7 +69,7 @@ _func_exit_;
/*
void sitesurvey_ctrl_handler(void *FunctionContext)
{
_adapter *adapter = (_adapter *)FunctionContext;
struct adapter *adapter = (struct adapter *)FunctionContext;
_sitesurvey_ctrl_handler(adapter);
@ -79,21 +79,21 @@ void sitesurvey_ctrl_handler(void *FunctionContext)
void rtw_join_timeout_handler (void *FunctionContext)
{
_adapter *adapter = (_adapter *)FunctionContext;
struct adapter *adapter = (struct adapter *)FunctionContext;
_rtw_join_timeout_handler(adapter);
}
void _rtw_scan_timeout_handler (void *FunctionContext)
{
_adapter *adapter = (_adapter *)FunctionContext;
struct adapter *adapter = (struct adapter *)FunctionContext;
rtw_scan_timeout_handler(adapter);
}
void _dynamic_check_timer_handlder (void *FunctionContext)
{
_adapter *adapter = (_adapter *)FunctionContext;
struct adapter *adapter = (struct adapter *)FunctionContext;
/* remove for MP power tracking DM.
#if (MP_DRIVER == 1)
if (adapter->registrypriv.mp_mode == 1)
@ -108,7 +108,7 @@ if (adapter->registrypriv.mp_mode == 1)
#ifdef CONFIG_SET_SCAN_DENY_TIMER
void _rtw_set_scan_deny_timer_hdl(void *FunctionContext)
{
_adapter *adapter = (_adapter *)FunctionContext;
struct adapter *adapter = (struct adapter *)FunctionContext;
rtw_set_scan_deny_timer_hdl(adapter);
}
#endif
@ -116,7 +116,7 @@ void _rtw_set_scan_deny_timer_hdl(void *FunctionContext)
#ifdef CONFIG_DETECT_C2H_BY_POLLING
void _rtw_event_polling_timer_hdl(void *FunctionContext)
{
_adapter *adapter = (_adapter *)FunctionContext;
struct adapter *adapter = (struct adapter *)FunctionContext;
rtw_event_polling_timer_hdl(adapter);
@ -124,7 +124,7 @@ void _rtw_event_polling_timer_hdl(void *FunctionContext)
}
#endif
void rtw_init_mlme_timer(_adapter *padapter)
void rtw_init_mlme_timer(struct adapter *padapter)
{
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -152,10 +152,10 @@ void rtw_init_mlme_timer(_adapter *padapter)
#endif
}
extern void rtw_indicate_wx_assoc_event(_adapter *padapter);
extern void rtw_indicate_wx_disassoc_event(_adapter *padapter);
extern void rtw_indicate_wx_assoc_event(struct adapter *padapter);
extern void rtw_indicate_wx_disassoc_event(struct adapter *padapter);
void rtw_os_indicate_connect(_adapter *adapter)
void rtw_os_indicate_connect(struct adapter *adapter)
{
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
_func_enter_;
@ -184,8 +184,8 @@ _func_exit_;
}
extern void indicate_wx_scan_complete_event(_adapter *padapter);
void rtw_os_indicate_scan_done( _adapter *padapter, bool aborted)
extern void indicate_wx_scan_complete_event(struct adapter *padapter);
void rtw_os_indicate_scan_done( struct adapter *padapter, bool aborted)
{
#ifdef CONFIG_IOCTL_CFG80211
rtw_cfg80211_indicate_scan_done(wdev_to_priv(padapter->rtw_wdev), aborted);
@ -194,7 +194,7 @@ void rtw_os_indicate_scan_done( _adapter *padapter, bool aborted)
}
static RT_PMKID_LIST backupPMKIDList[ NUM_PMKID_CACHE ];
void rtw_reset_securitypriv( _adapter *adapter )
void rtw_reset_securitypriv( struct adapter *adapter )
{
u8 backupPMKIDIndex = 0;
u8 backupTKIPCountermeasure = 0x00;
@ -258,7 +258,7 @@ void rtw_reset_securitypriv( _adapter *adapter )
_exit_critical_bh(&adapter->security_key_mutex, &irqL);
}
void rtw_os_indicate_disconnect( _adapter *adapter )
void rtw_os_indicate_disconnect( struct adapter *adapter )
{
//RT_PMKID_LIST backupPMKIDList[ NUM_PMKID_CACHE ];
@ -282,7 +282,7 @@ _func_exit_;
}
void rtw_report_sec_ie(_adapter *adapter,u8 authmode,u8 *sec_ie)
void rtw_report_sec_ie(struct adapter *adapter,u8 authmode,u8 *sec_ie)
{
uint len;
u8 *buff,*p,i;
@ -335,14 +335,14 @@ _func_exit_;
void _survey_timer_hdl (void *FunctionContext)
{
_adapter *padapter = (_adapter *)FunctionContext;
struct adapter *padapter = (struct adapter *)FunctionContext;
survey_timer_hdl(padapter);
}
void _link_timer_hdl (void *FunctionContext)
{
_adapter *padapter = (_adapter *)FunctionContext;
struct adapter *padapter = (struct adapter *)FunctionContext;
link_timer_hdl(padapter);
}
@ -355,12 +355,12 @@ void _addba_timer_hdl(void *FunctionContext)
#ifdef CONFIG_IEEE80211W
void _sa_query_timer_hdl (void *FunctionContext)
{
_adapter *padapter = (_adapter *)FunctionContext;
struct adapter *padapter = (struct adapter *)FunctionContext;
sa_query_timer_hdl(padapter);
}
#endif //CONFIG_IEEE80211W
void init_addba_retry_timer(_adapter *padapter, struct sta_info *psta)
void init_addba_retry_timer(struct adapter *padapter, struct sta_info *psta)
{
_init_timer(&psta->addba_retry_timer, padapter->pnetdev, _addba_timer_hdl, psta);
@ -369,18 +369,18 @@ void init_addba_retry_timer(_adapter *padapter, struct sta_info *psta)
/*
void _reauth_timer_hdl(void *FunctionContext)
{
_adapter *padapter = (_adapter *)FunctionContext;
struct adapter *padapter = (struct adapter *)FunctionContext;
reauth_timer_hdl(padapter);
}
void _reassoc_timer_hdl(void *FunctionContext)
{
_adapter *padapter = (_adapter *)FunctionContext;
struct adapter *padapter = (struct adapter *)FunctionContext;
reassoc_timer_hdl(padapter);
}
*/
void init_mlme_ext_timer(_adapter *padapter)
void init_mlme_ext_timer(struct adapter *padapter)
{
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
@ -397,7 +397,7 @@ void init_mlme_ext_timer(_adapter *padapter)
#ifdef CONFIG_AP_MODE
void rtw_indicate_sta_assoc_event(_adapter *padapter, struct sta_info *psta)
void rtw_indicate_sta_assoc_event(struct adapter *padapter, struct sta_info *psta)
{
union iwreq_data wrqu;
struct sta_priv *pstapriv = &padapter->stapriv;
@ -424,7 +424,7 @@ void rtw_indicate_sta_assoc_event(_adapter *padapter, struct sta_info *psta)
}
void rtw_indicate_sta_disassoc_event(_adapter *padapter, struct sta_info *psta)
void rtw_indicate_sta_disassoc_event(struct adapter *padapter, struct sta_info *psta)
{
union iwreq_data wrqu;
struct sta_priv *pstapriv = &padapter->stapriv;
@ -457,7 +457,7 @@ void rtw_indicate_sta_disassoc_event(_adapter *padapter, struct sta_info *psta)
static int mgnt_xmit_entry(struct sk_buff *skb, struct net_device *pnetdev)
{
struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev);
_adapter *padapter = (_adapter *)phostapdpriv->padapter;
struct adapter *padapter = (struct adapter *)phostapdpriv->padapter;
//DBG_871X("%s\n", __FUNCTION__);
@ -514,7 +514,7 @@ static const struct net_device_ops rtl871x_mgnt_netdev_ops = {
};
#endif
int hostapd_mode_init(_adapter *padapter)
int hostapd_mode_init(struct adapter *padapter)
{
unsigned char mac[ETH_ALEN];
struct hostapd_priv *phostapdpriv;
@ -605,7 +605,7 @@ int hostapd_mode_init(_adapter *padapter)
}
void hostapd_mode_unload(_adapter *padapter)
void hostapd_mode_unload(struct adapter *padapter)
{
struct hostapd_priv *phostapdpriv = padapter->phostapdpriv;
struct net_device *pnetdev = phostapdpriv->pmgnt_netdev;

611
os_dep/os_intfs.c
View file

@ -300,7 +300,7 @@ MODULE_PARM_DESC(rtw_notch_filter, "0:Disable, 1:Enable, 2:Enable only for P2P")
module_param_named(debug, rtw_debug, int, 0444);
MODULE_PARM_DESC(debug, "Set debug level (1-9) (default 1)");
static uint loadparam(PADAPTER padapter, _nic_hdl pnetdev);
static uint loadparam(struct adapter *padapter, _nic_hdl pnetdev);
int _netdev_open(struct net_device *pnetdev);
int netdev_open (struct net_device *pnetdev);
static int netdev_close (struct net_device *pnetdev);
@ -315,523 +315,16 @@ static int rtw_proc_cnt = 0;
#define RTW_PROC_NAME DRV_NAME
#if 1
void rtw_proc_init_one(struct net_device *dev)
{
}
void rtw_proc_remove_one(struct net_device *dev)
{
}
#else
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);
u8 rf_type;
if(rtw_proc == NULL)
{
if(padapter->chip_type == RTL8188C_8192C)
{
_rtw_memcpy(rtw_proc_name, RTL8192C_PROC_NAME, sizeof(RTL8192C_PROC_NAME));
}
else if(padapter->chip_type == RTL8192D)
{
_rtw_memcpy(rtw_proc_name, RTL8192D_PROC_NAME, sizeof(RTL8192D_PROC_NAME));
}
else if(padapter->chip_type == RTL8723A)
{
_rtw_memcpy(rtw_proc_name, RTW_PROC_NAME, sizeof(RTW_PROC_NAME));
}
else if(padapter->chip_type == RTL8188E)
{
_rtw_memcpy(rtw_proc_name, RTW_PROC_NAME, sizeof(RTW_PROC_NAME));
}
else
{
_rtw_memcpy(rtw_proc_name, RTW_PROC_NAME, sizeof(RTW_PROC_NAME));
}
#if(LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
rtw_proc=create_proc_entry(rtw_proc_name, S_IFDIR, proc_net);
#else
rtw_proc=create_proc_entry(rtw_proc_name, S_IFDIR, init_net.proc_net);
#endif
if (rtw_proc == NULL) {
DBG_871X(KERN_ERR "Unable to create rtw_proc directory\n");
return;
}
entry = create_proc_read_entry("ver_info", S_IFREG | S_IRUGO, rtw_proc, proc_get_drv_version, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
#ifdef DBG_MEM_ALLOC
entry = create_proc_read_entry("mstat", S_IFREG | S_IRUGO,
rtw_proc, proc_get_mstat, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
#endif /* DBG_MEM_ALLOC */
}
if(padapter->dir_dev == NULL)
{
padapter->dir_dev = create_proc_entry(dev->name,
S_IFDIR | S_IRUGO | S_IXUGO,
rtw_proc);
dir_dev = padapter->dir_dev;
if(dir_dev==NULL)
{
if(rtw_proc_cnt == 0)
{
if(rtw_proc){
#if(LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
remove_proc_entry(rtw_proc_name, proc_net);
#else
remove_proc_entry(rtw_proc_name, init_net.proc_net);
#endif
rtw_proc = NULL;
}
}
DBG_871X("Unable to create dir_dev directory\n");
return;
}
}
else
{
return;
}
rtw_proc_cnt++;
entry = create_proc_read_entry("write_reg", S_IFREG | S_IRUGO,
dir_dev, proc_get_write_reg, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry->write_proc = proc_set_write_reg;
entry = create_proc_read_entry("read_reg", S_IFREG | S_IRUGO,
dir_dev, proc_get_read_reg, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry->write_proc = proc_set_read_reg;
entry = create_proc_read_entry("fwstate", S_IFREG | S_IRUGO,
dir_dev, proc_get_fwstate, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("sec_info", S_IFREG | S_IRUGO,
dir_dev, proc_get_sec_info, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("mlmext_state", S_IFREG | S_IRUGO,
dir_dev, proc_get_mlmext_state, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("qos_option", S_IFREG | S_IRUGO,
dir_dev, proc_get_qos_option, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("ht_option", S_IFREG | S_IRUGO,
dir_dev, proc_get_ht_option, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("rf_info", S_IFREG | S_IRUGO,
dir_dev, proc_get_rf_info, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("ap_info", S_IFREG | S_IRUGO,
dir_dev, proc_get_ap_info, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("adapter_state", S_IFREG | S_IRUGO,
dir_dev, proc_get_adapter_state, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("trx_info", S_IFREG | S_IRUGO,
dir_dev, proc_get_trx_info, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("mac_reg_dump1", S_IFREG | S_IRUGO,
dir_dev, proc_get_mac_reg_dump1, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("mac_reg_dump2", S_IFREG | S_IRUGO,
dir_dev, proc_get_mac_reg_dump2, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("mac_reg_dump3", S_IFREG | S_IRUGO,
dir_dev, proc_get_mac_reg_dump3, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("bb_reg_dump1", S_IFREG | S_IRUGO,
dir_dev, proc_get_bb_reg_dump1, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("bb_reg_dump2", S_IFREG | S_IRUGO,
dir_dev, proc_get_bb_reg_dump2, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("bb_reg_dump3", S_IFREG | S_IRUGO,
dir_dev, proc_get_bb_reg_dump3, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("rf_reg_dump1", S_IFREG | S_IRUGO,
dir_dev, proc_get_rf_reg_dump1, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("rf_reg_dump2", S_IFREG | S_IRUGO,
dir_dev, proc_get_rf_reg_dump2, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type));
if((RF_1T2R == rf_type) ||(RF_1T1R ==rf_type )) {
entry = create_proc_read_entry("rf_reg_dump3", S_IFREG | S_IRUGO,
dir_dev, proc_get_rf_reg_dump3, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("rf_reg_dump4", S_IFREG | S_IRUGO,
dir_dev, proc_get_rf_reg_dump4, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
}
#ifdef CONFIG_AP_MODE
entry = create_proc_read_entry("all_sta_info", S_IFREG | S_IRUGO,
dir_dev, proc_get_all_sta_info, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
#endif
#ifdef DBG_MEMORY_LEAK
entry = create_proc_read_entry("_malloc_cnt", S_IFREG | S_IRUGO,
dir_dev, proc_get_malloc_cnt, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
#endif
#ifdef CONFIG_FIND_BEST_CHANNEL
entry = create_proc_read_entry("best_channel", S_IFREG | S_IRUGO,
dir_dev, proc_get_best_channel, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry->write_proc = proc_set_best_channel;
#endif
entry = create_proc_read_entry("rx_signal", S_IFREG | S_IRUGO,
dir_dev, proc_get_rx_signal, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry->write_proc = proc_set_rx_signal;
#ifdef CONFIG_80211N_HT
entry = create_proc_read_entry("ht_enable", S_IFREG | S_IRUGO,
dir_dev, proc_get_ht_enable, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry->write_proc = proc_set_ht_enable;
entry = create_proc_read_entry("cbw40_enable", S_IFREG | S_IRUGO,
dir_dev, proc_get_cbw40_enable, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry->write_proc = proc_set_cbw40_enable;
entry = create_proc_read_entry("ampdu_enable", S_IFREG | S_IRUGO,
dir_dev, proc_get_ampdu_enable, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry->write_proc = proc_set_ampdu_enable;
entry = create_proc_read_entry("rx_stbc", S_IFREG | S_IRUGO,
dir_dev, proc_get_rx_stbc, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry->write_proc = proc_set_rx_stbc;
#endif //CONFIG_80211N_HT
entry = create_proc_read_entry("path_rssi", S_IFREG | S_IRUGO,
dir_dev, proc_get_two_path_rssi, dev);
entry = create_proc_read_entry("rssi_disp", S_IFREG | S_IRUGO,
dir_dev, proc_get_rssi_disp, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry->write_proc = proc_set_rssi_disp;
#ifdef CONFIG_BT_COEXIST
entry = create_proc_read_entry("btcoex_dbg", S_IFREG | S_IRUGO,
dir_dev, proc_get_btcoex_dbg, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry->write_proc = proc_set_btcoex_dbg;
#endif /*CONFIG_BT_COEXIST*/
#if defined(DBG_CONFIG_ERROR_DETECT)
entry = create_proc_read_entry("sreset", S_IFREG | S_IRUGO,
dir_dev, proc_get_sreset, dev);
if (!entry) {
DBG_871X("Unable to create_proc_read_entry!\n");
return;
}
entry->write_proc = proc_set_sreset;
#endif /* DBG_CONFIG_ERROR_DETECT */
/* for odm */
{
struct proc_dir_entry *dir_odm = NULL;
if (padapter->dir_odm == NULL) {
padapter->dir_odm = create_proc_entry(
"odm", S_IFDIR | S_IRUGO | S_IXUGO, dir_dev);
dir_odm = padapter->dir_odm;
if(dir_odm==NULL) {
DBG_871X("Unable to create dir_odm directory\n");
return;
}
}
else
{
return;
}
entry = create_proc_read_entry("dbg_comp", S_IFREG | S_IRUGO,
dir_odm, proc_get_odm_dbg_comp, dev);
if (!entry) {
rtw_warn_on(1);
return;
}
entry->write_proc = proc_set_odm_dbg_comp;
entry = create_proc_read_entry("dbg_level", S_IFREG | S_IRUGO,
dir_odm, proc_get_odm_dbg_level, dev);
if (!entry) {
rtw_warn_on(1);
return;
}
entry->write_proc = proc_set_odm_dbg_level;
entry = create_proc_read_entry("adaptivity", S_IFREG | S_IRUGO,
dir_odm, proc_get_odm_adaptivity, dev);
if (!entry) {
rtw_warn_on(1);
return;
}
entry->write_proc = proc_set_odm_adaptivity;
}
}
void rtw_proc_remove_one(struct net_device *dev)
{
struct proc_dir_entry *dir_dev = NULL;
_adapter *padapter = rtw_netdev_priv(dev);
u8 rf_type;
dir_dev = padapter->dir_dev;
padapter->dir_dev = NULL;
if (dir_dev) {
remove_proc_entry("write_reg", dir_dev);
remove_proc_entry("read_reg", dir_dev);
remove_proc_entry("fwstate", dir_dev);
remove_proc_entry("sec_info", dir_dev);
remove_proc_entry("mlmext_state", dir_dev);
remove_proc_entry("qos_option", dir_dev);
remove_proc_entry("ht_option", dir_dev);
remove_proc_entry("rf_info", dir_dev);
remove_proc_entry("ap_info", dir_dev);
remove_proc_entry("adapter_state", dir_dev);
remove_proc_entry("trx_info", dir_dev);
remove_proc_entry("mac_reg_dump1", dir_dev);
remove_proc_entry("mac_reg_dump2", dir_dev);
remove_proc_entry("mac_reg_dump3", dir_dev);
remove_proc_entry("bb_reg_dump1", dir_dev);
remove_proc_entry("bb_reg_dump2", dir_dev);
remove_proc_entry("bb_reg_dump3", dir_dev);
remove_proc_entry("rf_reg_dump1", dir_dev);
remove_proc_entry("rf_reg_dump2", dir_dev);
rtw_hal_get_hwreg(padapter, HW_VAR_RF_TYPE, (u8 *)(&rf_type));
if((RF_1T2R == rf_type) ||(RF_1T1R ==rf_type )) {
remove_proc_entry("rf_reg_dump3", dir_dev);
remove_proc_entry("rf_reg_dump4", dir_dev);
}
#ifdef CONFIG_AP_MODE
remove_proc_entry("all_sta_info", dir_dev);
#endif
#ifdef DBG_MEMORY_LEAK
remove_proc_entry("_malloc_cnt", dir_dev);
#endif
#ifdef CONFIG_FIND_BEST_CHANNEL
remove_proc_entry("best_channel", dir_dev);
#endif
remove_proc_entry("rx_signal", dir_dev);
#ifdef CONFIG_80211N_HT
remove_proc_entry("cbw40_enable", dir_dev);
remove_proc_entry("ht_enable", dir_dev);
remove_proc_entry("ampdu_enable", dir_dev);
remove_proc_entry("rx_stbc", dir_dev);
#endif //CONFIG_80211N_HT
remove_proc_entry("path_rssi", dir_dev);
remove_proc_entry("rssi_disp", dir_dev);
#ifdef CONFIG_BT_COEXIST
remove_proc_entry("btcoex_dbg", dir_dev);
#endif //CONFIG_BT_COEXIST
#if defined(DBG_CONFIG_ERROR_DETECT)
remove_proc_entry("sreset", dir_dev);
#endif /* DBG_CONFIG_ERROR_DETECT */
/* for odm */
{
struct proc_dir_entry *dir_odm = NULL;
dir_odm = padapter->dir_odm;
padapter->dir_odm = NULL;
if (dir_odm) {
remove_proc_entry("dbg_comp", dir_odm);
remove_proc_entry("dbg_level", dir_odm);
remove_proc_entry("adaptivity", dir_odm);
remove_proc_entry("odm", dir_dev);
}
}
remove_proc_entry(dev->name, rtw_proc);
dir_dev = NULL;
}
else
{
return;
}
rtw_proc_cnt--;
if(rtw_proc_cnt == 0)
{
if(rtw_proc){
remove_proc_entry("ver_info", rtw_proc);
#ifdef DBG_MEM_ALLOC
remove_proc_entry("mstat", rtw_proc);
#endif /* DBG_MEM_ALLOC */
#if(LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
remove_proc_entry(rtw_proc_name, proc_net);
#else
remove_proc_entry(rtw_proc_name, init_net.proc_net);
#endif
rtw_proc = NULL;
}
}
}
#endif
#endif
uint loadparam( _adapter *padapter, _nic_hdl pnetdev)
uint loadparam( struct adapter *padapter, _nic_hdl pnetdev)
{
uint status = _SUCCESS;
@ -968,7 +461,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)
@ -985,7 +478,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);
@ -1036,7 +529,7 @@ 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);
@ -1095,11 +588,11 @@ 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);
#ifdef CONFIG_EASY_REPLACEMENT
struct net_device *TargetNetdev = NULL;
_adapter *TargetAdapter = NULL;
struct adapter *TargetAdapter = NULL;
struct net *devnet = NULL;
if(padapter->bDongle == 1)
@ -1145,17 +638,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;
@ -1203,7 +696,7 @@ struct net_device *rtw_init_netdev(_adapter *old_padapter)
}
u32 rtw_start_drv_threads(_adapter *padapter)
u32 rtw_start_drv_threads(struct adapter *padapter)
{
u32 _status = _SUCCESS;
@ -1253,7 +746,7 @@ u32 rtw_start_drv_threads(_adapter *padapter)
void rtw_unregister_netdevs(struct dvobj_priv *dvobj)
{
int i;
_adapter *padapter = NULL;
struct adapter *padapter = NULL;
for(i=0;i<dvobj->iface_nums;i++)
{
@ -1281,7 +774,7 @@ void rtw_unregister_netdevs(struct dvobj_priv *dvobj)
}
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"));
@ -1322,8 +815,8 @@ void rtw_stop_drv_threads (_adapter *padapter)
rtw_hal_stop_thread(padapter);
}
u8 rtw_init_default_value(_adapter *padapter);
u8 rtw_init_default_value(_adapter *padapter)
u8 rtw_init_default_value(struct adapter *padapter);
u8 rtw_init_default_value(struct adapter *padapter)
{
u8 ret = _SUCCESS;
struct registry_priv* pregistrypriv = &padapter->registrypriv;
@ -1396,7 +889,7 @@ 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;
@ -1438,7 +931,7 @@ u8 rtw_reset_drv_sw(_adapter *padapter)
}
u8 rtw_init_drv_sw(_adapter *padapter)
u8 rtw_init_drv_sw(struct adapter *padapter)
{
u8 ret8=_SUCCESS;
@ -1573,14 +1066,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"));
@ -1631,7 +1124,7 @@ void rtw_cancel_all_timer(_adapter *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;
@ -1725,8 +1218,8 @@ u8 rtw_free_drv_sw(_adapter *padapter)
#ifdef CONFIG_CONCURRENT_MODE
int _netdev_if2_open(struct net_device *pnetdev)
{
_adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev);
_adapter *primary_padapter = padapter->pbuddy_adapter;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
struct adapter *primary_padapter = padapter->pbuddy_adapter;
DBG_871X("+871x_drv - if2_open, bup=%d\n", padapter->bup);
@ -1798,7 +1291,7 @@ netdev_if2_open_error:
int netdev_if2_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(&(adapter_to_dvobj(padapter)->hw_init_mutex), NULL);
ret = _netdev_if2_open(pnetdev);
@ -1808,7 +1301,7 @@ int netdev_if2_open(struct net_device *pnetdev)
static int netdev_if2_close(struct net_device *pnetdev)
{
_adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
padapter->net_closed = _TRUE;
@ -1847,11 +1340,11 @@ static const struct net_device_ops rtw_netdev_if2_ops = {
#ifdef CONFIG_SDIO_HCI
#include <sdio_hal.h>
#endif
_adapter *rtw_drv_if2_init(_adapter *primary_padapter, void (*set_intf_ops)(struct _io_ops *pops))
struct adapter *rtw_drv_if2_init(struct adapter *primary_padapter, void (*set_intf_ops)(struct _io_ops *pops))
{
int res = _FAIL;
struct net_device *pnetdev = NULL;
_adapter *padapter = NULL;
struct adapter *padapter = NULL;
struct dvobj_priv *pdvobjpriv;
u8 mac[ETH_ALEN];
@ -1874,7 +1367,7 @@ _adapter *rtw_drv_if2_init(_adapter *primary_padapter, void (*set_intf_ops)(stru
/****** init adapter ******/
padapter = rtw_netdev_priv(pnetdev);
_rtw_memcpy(padapter, primary_padapter, sizeof(_adapter));
_rtw_memcpy(padapter, primary_padapter, sizeof(struct adapter));
//
padapter->bup = _FALSE;
@ -1982,9 +1475,9 @@ error_rtw_drv_if2_init:
}
void rtw_drv_if2_free(_adapter *if2)
void rtw_drv_if2_free(struct adapter *if2)
{
_adapter *padapter = if2;
struct adapter *padapter = if2;
struct net_device *pnetdev = NULL;
if (padapter == NULL)
@ -2003,9 +1496,9 @@ void rtw_drv_if2_free(_adapter *if2)
}
void rtw_drv_if2_stop(_adapter *if2)
void rtw_drv_if2_stop(struct adapter *if2)
{
_adapter *padapter = if2;
struct adapter *padapter = if2;
//struct net_device *pnetdev = NULL;
if (padapter == NULL)
@ -2047,7 +1540,7 @@ void rtw_drv_if2_stop(_adapter *if2)
#ifdef CONFIG_BR_EXT
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();
@ -2093,7 +1586,7 @@ void netdev_br_init(struct net_device *netdev)
}
#endif //CONFIG_BR_EXT
static int _rtw_drv_register_netdev(_adapter *padapter, char *name)
static int _rtw_drv_register_netdev(struct adapter *padapter, char *name)
{
int ret = _SUCCESS;
struct net_device *pnetdev = padapter->pnetdev;
@ -2126,7 +1619,7 @@ error_register_netdev:
return ret;
}
int rtw_drv_register_netdev(_adapter *if1)
int rtw_drv_register_netdev(struct adapter *if1)
{
int i, status = _SUCCESS;
struct dvobj_priv *dvobj = if1->dvobj;
@ -2135,7 +1628,7 @@ int rtw_drv_register_netdev(_adapter *if1)
{
for(i=0; i<dvobj->iface_nums; i++)
{
_adapter *padapter = dvobj->padapters[i];
struct adapter *padapter = dvobj->padapters[i];
if(padapter)
{
@ -2161,7 +1654,7 @@ int rtw_drv_register_netdev(_adapter *if1)
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 = adapter_to_pwrctl(padapter);
RT_TRACE(_module_os_intfs_c_,_drv_info_,("+871x_drv - dev_open\n"));
@ -2245,7 +1738,7 @@ netdev_open_normal_process:
#ifdef CONFIG_CONCURRENT_MODE
{
_adapter *sec_adapter = padapter->pbuddy_adapter;
struct adapter *sec_adapter = padapter->pbuddy_adapter;
if(sec_adapter && (sec_adapter->bup == _FALSE))
_netdev_if2_open(sec_adapter->pnetdev);
}
@ -2273,7 +1766,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(&(adapter_to_dvobj(padapter)->hw_init_mutex), NULL);
ret = _netdev_open(pnetdev);
@ -2283,7 +1776,7 @@ int netdev_open(struct net_device *pnetdev)
}
#ifdef CONFIG_IPS
int ips_netdrv_open(_adapter *padapter)
int ips_netdrv_open(struct adapter *padapter)
{
int status = _SUCCESS;
padapter->net_closed = _FALSE;
@ -2323,7 +1816,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();
@ -2339,7 +1832,7 @@ int rtw_ips_pwr_up(_adapter *padapter)
}
void rtw_ips_pwr_down(_adapter *padapter)
void rtw_ips_pwr_down(struct adapter *padapter)
{
u32 start_time = rtw_get_current_time();
DBG_871X("===> rtw_ips_pwr_down...................\n");
@ -2354,7 +1847,7 @@ void rtw_ips_pwr_down(_adapter *padapter)
DBG_871X("<=== rtw_ips_pwr_down..................... in %dms\n", rtw_get_passing_time_ms(start_time));
}
#endif
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);
@ -2376,7 +1869,7 @@ void rtw_ips_dev_unload(_adapter *padapter)
}
#ifdef CONFIG_RF_GAIN_OFFSET
void rtw_bb_rf_gain_offset(_adapter *padapter)
void rtw_bb_rf_gain_offset(struct adapter *padapter)
{
u8 value = padapter->eeprompriv.EEPROMRFGainOffset;
u8 tmp = 0x3e;
@ -2415,7 +1908,7 @@ int pm_netdev_open(struct net_device *pnetdev,u8 bnormal)
status = netdev_open(pnetdev);
#ifdef CONFIG_IPS
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);
#endif
return status;
@ -2423,7 +1916,7 @@ int pm_netdev_open(struct net_device *pnetdev,u8 bnormal)
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_,("+871x_drv - drv_close\n"));
@ -2472,7 +1965,7 @@ static int netdev_close(struct net_device *pnetdev)
#ifdef CONFIG_BR_EXT
//if (OPMODE & (WIFI_STATION_STATE | WIFI_ADHOC_STATE))
{
//void nat25_db_cleanup(_adapter *priv);
//void nat25_db_cleanup(struct adapter *priv);
nat25_db_cleanup(padapter);
}
#endif // CONFIG_BR_EXT
@ -2758,7 +2251,7 @@ static int get_defaultgw(u32 *ip_addr ,char mac[])
return 0;
}
int rtw_gw_addr_query(_adapter *padapter)
int rtw_gw_addr_query(struct adapter *padapter)
{
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
u32 gw_addr = 0; // default gw address
@ -2786,7 +2279,7 @@ int rtw_gw_addr_query(_adapter *padapter)
}
#endif
int rtw_suspend_free_assoc_resource(_adapter *padapter)
int rtw_suspend_free_assoc_resource(struct adapter *padapter)
{
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct net_device *pnetdev = padapter->pnetdev;
@ -2842,8 +2335,8 @@ int rtw_suspend_free_assoc_resource(_adapter *padapter)
DBG_871X("==> "FUNC_ADPT_FMT" exit....\n", FUNC_ADPT_ARG(padapter));
return 0;
}
extern void rtw_dev_unload(_adapter *padapter);
int rtw_suspend_common(_adapter *padapter)
extern void rtw_dev_unload(struct adapter *padapter);
int rtw_suspend_common(struct adapter *padapter)
{
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -2874,7 +2367,7 @@ exit:
return ret;
}
int rtw_resume_common(_adapter *padapter)
int rtw_resume_common(struct adapter *padapter)
{
int ret = 0;
struct net_device *pnetdev= padapter->pnetdev;

2
os_dep/osdep_service.c
View file

@ -1270,7 +1270,7 @@ RETURN:
* Jeff: this function should be called under ioctl (rtnl_lock is accquired) while
* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
*/
int rtw_change_ifname(_adapter *padapter, const char *ifname)
int rtw_change_ifname(struct adapter *padapter, const char *ifname)
{
struct net_device *pnetdev;
struct net_device *cur_pnetdev = padapter->pnetdev;

20
os_dep/recv_linux.c
View file

@ -34,7 +34,7 @@
#endif
//init os related resource in struct recv_priv
int rtw_os_recv_resource_init(struct recv_priv *precvpriv, _adapter *padapter)
int rtw_os_recv_resource_init(struct recv_priv *precvpriv, struct adapter *padapter)
{
int res=_SUCCESS;
@ -42,7 +42,7 @@ int rtw_os_recv_resource_init(struct recv_priv *precvpriv, _adapter *padapter)
}
//alloc os related resource in union recv_frame
int rtw_os_recv_resource_alloc(_adapter *padapter, union recv_frame *precvframe)
int rtw_os_recv_resource_alloc(struct adapter *padapter, union recv_frame *precvframe)
{
int res=_SUCCESS;
@ -73,7 +73,7 @@ void rtw_os_recv_resource_free(struct recv_priv *precvpriv)
//alloc os related resource in struct recv_buf
int rtw_os_recvbuf_resource_alloc(_adapter *padapter, struct recv_buf *precvbuf)
int rtw_os_recvbuf_resource_alloc(struct adapter *padapter, struct recv_buf *precvbuf)
{
int res=_SUCCESS;
@ -112,7 +112,7 @@ int rtw_os_recvbuf_resource_alloc(_adapter *padapter, struct recv_buf *precvbuf)
}
//free os related resource in struct recv_buf
int rtw_os_recvbuf_resource_free(_adapter *padapter, struct recv_buf *precvbuf)
int rtw_os_recvbuf_resource_free(struct adapter *padapter, struct recv_buf *precvbuf)
{
int ret = _SUCCESS;
@ -146,7 +146,7 @@ int rtw_os_recvbuf_resource_free(_adapter *padapter, struct recv_buf *precvbuf)
}
void rtw_handle_tkip_mic_err(_adapter *padapter,u8 bgroup)
void rtw_handle_tkip_mic_err(struct adapter *padapter,u8 bgroup)
{
#ifdef CONFIG_IOCTL_CFG80211
enum nl80211_key_type key_type;
@ -212,7 +212,7 @@ void rtw_handle_tkip_mic_err(_adapter *padapter,u8 bgroup)
#endif
}
void rtw_hostapd_mlme_rx(_adapter *padapter, union recv_frame *precv_frame)
void rtw_hostapd_mlme_rx(struct adapter *padapter, union recv_frame *precv_frame)
{
#ifdef CONFIG_HOSTAPD_MLME
_pkt *skb;
@ -253,7 +253,7 @@ void rtw_hostapd_mlme_rx(_adapter *padapter, union recv_frame *precv_frame)
#endif
}
int rtw_recv_indicatepkt(_adapter *padapter, union recv_frame *precv_frame)
int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame)
{
struct recv_priv *precvpriv;
_queue *pfree_recv_queue;
@ -369,7 +369,7 @@ _func_enter_;
if( br_port && (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE) )
{
int nat25_handle_frame(_adapter *priv, struct sk_buff *skb);
int nat25_handle_frame(struct adapter *priv, struct sk_buff *skb);
if (nat25_handle_frame(padapter, skb) == -1) {
//priv->ext_stats.rx_data_drops++;
//DEBUG_ERR("RX DROP: nat25_handle_frame fail!\n");
@ -469,7 +469,7 @@ _func_exit_;
}
void rtw_os_read_port(_adapter *padapter, struct recv_buf *precvbuf)
void rtw_os_read_port(struct adapter *padapter, struct recv_buf *precvbuf)
{
struct recv_priv *precvpriv = &padapter->recvpriv;
@ -504,7 +504,7 @@ void _rtw_reordering_ctrl_timeout_handler (void *FunctionContext)
void rtw_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl)
{
_adapter *padapter = preorder_ctrl->padapter;
struct adapter *padapter = preorder_ctrl->padapter;
_init_timer(&(preorder_ctrl->reordering_ctrl_timer), padapter->pnetdev, _rtw_reordering_ctrl_timeout_handler, preorder_ctrl);

20
os_dep/rtw_android.c
View file

@ -244,7 +244,7 @@ int rtw_android_cmdstr_to_num(char *cmdstr)
static int rtw_android_get_rssi(struct net_device *net, char *command, int total_len)
{
_adapter *padapter = (_adapter *)rtw_netdev_priv(net);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(net);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct wlan_network *pcur_network = &pmlmepriv->cur_network;
int bytes_written = 0;
@ -259,7 +259,7 @@ static int rtw_android_get_rssi(struct net_device *net, char *command, int total
static int rtw_android_get_link_speed(struct net_device *net, char *command, int total_len)
{
_adapter *padapter = (_adapter *)rtw_netdev_priv(net);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(net);
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct wlan_network *pcur_network = &pmlmepriv->cur_network;
int bytes_written = 0;
@ -273,7 +273,7 @@ static int rtw_android_get_link_speed(struct net_device *net, char *command, int
static int rtw_android_get_macaddr(struct net_device *net, char *command, int total_len)
{
_adapter *adapter = (_adapter *)rtw_netdev_priv(net);
struct adapter *adapter = (struct adapter *)rtw_netdev_priv(net);
int bytes_written = 0;
bytes_written = snprintf(command, total_len, "Macaddr = "MAC_FMT, MAC_ARG(net->dev_addr));
@ -282,7 +282,7 @@ static int rtw_android_get_macaddr(struct net_device *net, char *command, int to
static int rtw_android_set_country(struct net_device *net, char *command, int total_len)
{
_adapter *adapter = (_adapter *)rtw_netdev_priv(net);
struct adapter *adapter = (struct adapter *)rtw_netdev_priv(net);
char *country_code = command + strlen(android_wifi_cmd_str[ANDROID_WIFI_CMD_COUNTRY]) + 1;
int ret = _FAIL;
@ -304,7 +304,7 @@ static int rtw_android_get_p2p_dev_addr(struct net_device *net, char *command, i
static int rtw_android_set_block(struct net_device *net, char *command, int total_len)
{
_adapter *adapter = (_adapter *)rtw_netdev_priv(net);
struct adapter *adapter = (struct adapter *)rtw_netdev_priv(net);
char *block_value = command + strlen(android_wifi_cmd_str[ANDROID_WIFI_CMD_BLOCK]) + 1;
#ifdef CONFIG_IOCTL_CFG80211
@ -337,7 +337,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
int cmd_num;
int bytes_written = 0;
android_wifi_priv_cmd priv_cmd;
_adapter* padapter = ( _adapter * ) rtw_netdev_priv(net);
struct adapter* padapter = ( struct adapter * ) rtw_netdev_priv(net);
#ifdef CONFIG_WFD
struct wifi_display_info *pwfd_info;
#endif
@ -399,7 +399,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
break;
case ANDROID_WIFI_CMD_SCAN_ACTIVE:
//rtw_set_scan_mode((_adapter *)rtw_netdev_priv(net), SCAN_ACTIVE);
//rtw_set_scan_mode((struct adapter *)rtw_netdev_priv(net), SCAN_ACTIVE);
#ifdef CONFIG_PLATFORM_MSTAR
#ifdef CONFIG_IOCTL_CFG80211
(wdev_to_priv(net->ieee80211_ptr))->bandroid_scan = _TRUE;
@ -407,7 +407,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
#endif //CONFIG_PLATFORM_MSTAR
break;
case ANDROID_WIFI_CMD_SCAN_PASSIVE:
//rtw_set_scan_mode((_adapter *)rtw_netdev_priv(net), SCAN_PASSIVE);
//rtw_set_scan_mode((struct adapter *)rtw_netdev_priv(net), SCAN_PASSIVE);
break;
case ANDROID_WIFI_CMD_RSSI:
@ -466,7 +466,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
case ANDROID_WIFI_CMD_SETBAND:
{
uint band = *(command + strlen("SETBAND") + 1) - '0';
_adapter* padapter = ( _adapter * ) rtw_netdev_priv(net);
struct adapter* padapter = ( struct adapter * ) rtw_netdev_priv(net);
if (padapter->chip_type == RTL8192D)
padapter->setband = band;
@ -554,7 +554,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
// Specify the WFD device type ( WFD source/primary sink )
struct wifi_display_info *pwfd_info;
_adapter* padapter = ( _adapter * ) rtw_netdev_priv(net);
struct adapter* padapter = ( struct adapter * ) rtw_netdev_priv(net);
pwfd_info = &padapter->wfd_info;
if (padapter->wdinfo.driver_interface == DRIVER_CFG80211) {

46
os_dep/usb_intf.c
View file

@ -54,7 +54,7 @@ int ui_pid[3] = {0, 0, 0};
extern int pm_netdev_open(struct net_device *pnetdev,u8 bnormal);
static int rtw_suspend(struct usb_interface *intf, pm_message_t message);
static int rtw_resume(struct usb_interface *intf);
int rtw_resume_process(_adapter *padapter);
int rtw_resume_process(struct adapter *padapter);
static int rtw_drv_init(struct usb_interface *pusb_intf,const struct usb_device_id *pdid);
@ -64,7 +64,7 @@ static void rtw_dev_shutdown(struct device *dev)
{
struct usb_interface *usb_intf = container_of(dev, struct usb_interface, dev);
struct dvobj_priv *dvobj = usb_get_intfdata(usb_intf);
_adapter *adapter = dvobj->if1;
struct adapter *adapter = dvobj->if1;
int i;
DBG_871X("%s\n", __func__);
@ -481,13 +481,13 @@ _func_enter_;
_func_exit_;
}
static void decide_chip_type_by_usb_device_id(_adapter *padapter, const struct usb_device_id *pdid)
static void decide_chip_type_by_usb_device_id(struct adapter *padapter, const struct usb_device_id *pdid)
{
padapter->chip_type = NULL_CHIP_TYPE;
hal_set_hw_type(padapter);
}
static void usb_intf_start(_adapter *padapter)
static void usb_intf_start(struct adapter *padapter)
{
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+usb_intf_start\n"));
@ -498,7 +498,7 @@ static void usb_intf_start(_adapter *padapter)
}
static void usb_intf_stop(_adapter *padapter)
static void usb_intf_stop(struct adapter *padapter)
{
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+usb_intf_stop\n"));
@ -523,7 +523,7 @@ static void usb_intf_stop(_adapter *padapter)
}
void rtw_dev_unload(_adapter *padapter)
void rtw_dev_unload(struct adapter *padapter)
{
struct net_device *pnetdev= (struct net_device*)padapter->pnetdev;
u8 val8;
@ -619,7 +619,7 @@ static void process_spec_devid(const struct usb_device_id *pdid)
}
#ifdef SUPPORT_HW_RFOFF_DETECTED
int rtw_hw_suspend(_adapter *padapter )
int rtw_hw_suspend(struct adapter *padapter )
{
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
struct usb_interface *pusb_intf = adapter_to_dvobj(padapter)->pusbintf;
@ -697,7 +697,7 @@ error_exit:
}
int rtw_hw_resume(_adapter *padapter)
int rtw_hw_resume(struct adapter *padapter)
{
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
struct usb_interface *pusb_intf = adapter_to_dvobj(padapter)->pusbintf;
@ -750,7 +750,7 @@ error_exit:
#if 1
#ifdef CONFIG_WOWLAN
static void rtw_suspend_wow(_adapter *padapter)
static void rtw_suspend_wow(struct adapter *padapter)
{
struct net_device *pnetdev = padapter->pnetdev;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@ -825,7 +825,7 @@ static void rtw_suspend_wow(_adapter *padapter)
static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
{
struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf);
_adapter *padapter = dvobj->if1;
struct adapter *padapter = dvobj->if1;
struct net_device *pnetdev = padapter->pnetdev;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct pwrctrl_priv *pwrpriv = dvobj_to_pwrctl(dvobj);
@ -898,7 +898,7 @@ exit:
static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
{
struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf);
_adapter *padapter = dvobj->if1;
struct adapter *padapter = dvobj->if1;
struct net_device *pnetdev = padapter->pnetdev;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct pwrctrl_priv *pwrpriv = dvobj_to_pwrctl(dvobj);
@ -1019,7 +1019,7 @@ exit:
static int rtw_resume(struct usb_interface *pusb_intf)
{
struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf);
_adapter *padapter = dvobj->if1;
struct adapter *padapter = dvobj->if1;
struct net_device *pnetdev = padapter->pnetdev;
struct pwrctrl_priv *pwrpriv = dvobj_to_pwrctl(dvobj);
int ret = 0;
@ -1047,7 +1047,7 @@ static int rtw_resume(struct usb_interface *pusb_intf)
}
int rtw_resume_process(_adapter *padapter)
int rtw_resume_process(struct adapter *padapter)
{
struct net_device *pnetdev;
struct pwrctrl_priv *pwrpriv;
@ -1146,7 +1146,7 @@ exit:
}
#ifdef CONFIG_AUTOSUSPEND
void autosuspend_enter(_adapter* padapter)
void autosuspend_enter(struct adapter* padapter)
{
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
@ -1201,7 +1201,7 @@ void autosuspend_enter(_adapter* padapter)
#endif
}
int autoresume_enter(_adapter* padapter)
int autoresume_enter(struct adapter* padapter)
{
int result = _SUCCESS;
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
@ -1293,16 +1293,16 @@ static script_item_u item;
* We accept the new device by returning 0.
*/
_adapter *rtw_sw_export = NULL;
struct adapter *rtw_sw_export = NULL;
_adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
struct usb_interface *pusb_intf, const struct usb_device_id *pdid)
{
_adapter *padapter = NULL;
struct adapter *padapter = NULL;
struct net_device *pnetdev = NULL;
int status = _FAIL;
if ((padapter = (_adapter *)rtw_zvmalloc(sizeof(*padapter))) == NULL) {
if ((padapter = (struct adapter *)rtw_zvmalloc(sizeof(*padapter))) == NULL) {
goto exit;
}
padapter->dvobj = dvobj;
@ -1459,7 +1459,7 @@ exit:
return padapter;
}
static void rtw_usb_if1_deinit(_adapter *if1)
static void rtw_usb_if1_deinit(struct adapter *if1)
{
struct net_device *pnetdev = if1->pnetdev;
struct mlme_priv *pmlmepriv= &if1->mlmepriv;
@ -1649,7 +1649,7 @@ static void dump_usb_interface(struct usb_interface *usb_intf)
static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device_id *pdid)
{
int i;
_adapter *if1 = NULL, *if2 = NULL;
struct adapter *if1 = NULL, *if2 = NULL;
int status;
struct dvobj_priv *dvobj;
@ -1738,7 +1738,7 @@ extern void rtw_unregister_netdevs(struct dvobj_priv *dvobj);
static void rtw_dev_remove(struct usb_interface *pusb_intf)
{
struct dvobj_priv *dvobj = usb_get_intfdata(pusb_intf);
_adapter *padapter = dvobj->if1;
struct adapter *padapter = dvobj->if1;
struct net_device *pnetdev = padapter->pnetdev;
struct mlme_priv *pmlmepriv= &padapter->mlmepriv;
@ -1879,7 +1879,7 @@ module_init(rtw_drv_entry);
module_exit(rtw_drv_halt);
#ifdef CONFIG_INTEL_PROXIM
_adapter *rtw_usb_get_sw_pointer(void)
struct adapter *rtw_usb_get_sw_pointer(void)
{
return rtw_sw_export;
}

12
os_dep/usb_ops_linux.c
View file

@ -216,7 +216,7 @@ static u32 usb_bulkout_zero(struct intf_hdl *pintfhdl, u32 addr)
unsigned char *pbuf;
struct zero_bulkout_context *pcontext;
PURB purb = NULL;
_adapter *padapter = (_adapter *)pintfhdl->padapter;
struct adapter *padapter = (struct adapter *)pintfhdl->padapter;
struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter);
struct usb_device *pusbd = pdvobj->pusbdev;
@ -281,7 +281,7 @@ void usb_read_port_cancel(struct intf_hdl *pintfhdl)
{
int i;
struct recv_buf *precvbuf;
_adapter *padapter = pintfhdl->padapter;
struct adapter *padapter = pintfhdl->padapter;
precvbuf = (struct recv_buf *)padapter->recvpriv.precv_buf;
DBG_871X("%s\n", __func__);
@ -309,8 +309,8 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs)
int i;
struct xmit_buf *pxmitbuf = (struct xmit_buf *)purb->context;
//struct xmit_frame *pxmitframe = (struct xmit_frame *)pxmitbuf->priv_data;
//_adapter *padapter = pxmitframe->padapter;
_adapter *padapter = pxmitbuf->padapter;
//struct adapter *padapter = pxmitframe->padapter;
struct adapter *padapter = pxmitbuf->padapter;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
//struct pkt_attrib *pattrib = &pxmitframe->attrib;
@ -463,7 +463,7 @@ u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)
int status;
u32 ret = _FAIL, bwritezero = _FALSE;
PURB purb = NULL;
_adapter *padapter = (_adapter *)pintfhdl->padapter;
struct adapter *padapter = (struct adapter *)pintfhdl->padapter;
struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter);
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
struct xmit_buf *pxmitbuf = (struct xmit_buf *)wmem;
@ -669,7 +669,7 @@ _func_exit_;
void usb_write_port_cancel(struct intf_hdl *pintfhdl)
{
int i, j;
_adapter *padapter = pintfhdl->padapter;
struct adapter *padapter = pintfhdl->padapter;
struct xmit_buf *pxmitbuf = (struct xmit_buf *)padapter->xmitpriv.pxmitbuf;
DBG_871X("%s \n", __func__);

18
os_dep/xmit_linux.c
View file

@ -123,7 +123,7 @@ void rtw_set_tx_chksum_offload(_pkt *pkt, struct pkt_attrib *pattrib)
}
int rtw_os_xmit_resource_alloc(_adapter *padapter, struct xmit_buf *pxmitbuf,u32 alloc_sz)
int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *pxmitbuf,u32 alloc_sz)
{
#ifdef CONFIG_USB_HCI
int i;
@ -172,7 +172,7 @@ int rtw_os_xmit_resource_alloc(_adapter *padapter, struct xmit_buf *pxmitbuf,u32
return _SUCCESS;
}
void rtw_os_xmit_resource_free(_adapter *padapter, struct xmit_buf *pxmitbuf,u32 free_sz)
void rtw_os_xmit_resource_free(struct adapter *padapter, struct xmit_buf *pxmitbuf,u32 free_sz)
{
#ifdef CONFIG_USB_HCI
int i;
@ -207,7 +207,7 @@ void rtw_os_xmit_resource_free(_adapter *padapter, struct xmit_buf *pxmitbuf,u32
#define WMM_XMIT_THRESHOLD (NR_XMITFRAME*2/5)
void rtw_os_pkt_complete(_adapter *padapter, _pkt *pkt)
void rtw_os_pkt_complete(struct adapter *padapter, _pkt *pkt)
{
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
u16 queue;
@ -232,7 +232,7 @@ void rtw_os_pkt_complete(_adapter *padapter, _pkt *pkt)
rtw_skb_free(pkt);
}
void rtw_os_xmit_complete(_adapter *padapter, struct xmit_frame *pxframe)
void rtw_os_xmit_complete(struct adapter *padapter, struct xmit_frame *pxframe)
{
if(pxframe->pkt)
rtw_os_pkt_complete(padapter, pxframe->pkt);
@ -240,9 +240,9 @@ void rtw_os_xmit_complete(_adapter *padapter, struct xmit_frame *pxframe)
pxframe->pkt = NULL;
}
void rtw_os_xmit_schedule(_adapter *padapter)
void rtw_os_xmit_schedule(struct adapter *padapter)
{
_adapter *pri_adapter = padapter;
struct adapter *pri_adapter = padapter;
#if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
if(!padapter)
@ -277,7 +277,7 @@ void rtw_os_xmit_schedule(_adapter *padapter)
#endif
}
static void rtw_check_xmit_resource(_adapter *padapter, _pkt *pkt)
static void rtw_check_xmit_resource(struct adapter *padapter, _pkt *pkt)
{
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,35))
@ -306,7 +306,7 @@ static void rtw_check_xmit_resource(_adapter *padapter, _pkt *pkt)
}
#ifdef CONFIG_TX_MCAST2UNI
static int rtw_mlcst2unicst(_adapter *padapter, struct sk_buff *skb)
static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb)
{
struct sta_priv *pstapriv = &padapter->stapriv;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@ -378,7 +378,7 @@ static int rtw_mlcst2unicst(_adapter *padapter, struct sk_buff *skb)
int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev)
{
_adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev);
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
#ifdef CONFIG_TX_MCAST2UNI
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;