Skip to content

L
linux
Commit 4d7dc178 authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman
Browse files
Options

staging: r8188eu: remove unnecessary type cast of rtw_netdev_priv() result 

The type cast
padapter = (struct adapter *)rtw_netdev_priv(dev);
do nothing because type of rtw_netdev_priv() result
is (struct adapter *).
Signed-off-by: default avatarIvan Safonov <insafonov@gmail.com>
Link: https://lore.kernel.org/r/20200815203306.121039-1-insafonov@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2147dd40
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 58 deletions
drivers/staging/rtl8188eu/core/rtw_debug.c
View file @ 4d7dc178
...@@ -33,7 +33,7 @@ int proc_set_write_reg(struct file *file, const char __user *buffer, ...@@ -33,7 +33,7 @@ int proc_set_write_reg(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
struct net_device *dev = data; struct net_device *dev = data;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
char tmp[32]; char tmp[32];
u32 addr, val, len; u32 addr, val, len;
...@@ -75,7 +75,7 @@ int proc_get_read_reg(char *page, char **start, ...@@ -75,7 +75,7 @@ int proc_get_read_reg(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = data; struct net_device *dev = data;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
int len = 0; int len = 0;
...@@ -135,7 +135,7 @@ int proc_get_adapter_state(char *page, char **start, ...@@ -135,7 +135,7 @@ int proc_get_adapter_state(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = data; struct net_device *dev = data;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
int len = 0; int len = 0;
len += scnprintf(page + len, count - len, "bSurpriseRemoved=%d, bDriverStopped=%d\n", len += scnprintf(page + len, count - len, "bSurpriseRemoved=%d, bDriverStopped=%d\n",
...@@ -150,7 +150,7 @@ int proc_get_best_channel(char *page, char **start, ...@@ -150,7 +150,7 @@ int proc_get_best_channel(char *page, char **start,
int *eof, void *data) int *eof, void *data)
{ {
struct net_device *dev = data; struct net_device *dev = data;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
int len = 0; int len = 0;
u32 i, best_channel_24G = 1, index_24G = 0; u32 i, best_channel_24G = 1, index_24G = 0;
......
drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
View file @ 4d7dc178
...@@ -84,7 +84,7 @@ static int rtw_hw_resume(struct adapter *padapter) ...@@ -84,7 +84,7 @@ static int rtw_hw_resume(struct adapter *padapter)
pwrpriv->bips_processing = true; pwrpriv->bips_processing = true;
rtw_reset_drv_sw(padapter); rtw_reset_drv_sw(padapter);
if (ips_netdrv_open((struct adapter *)rtw_netdev_priv(pnetdev)) != _SUCCESS) { if (ips_netdrv_open(rtw_netdev_priv(pnetdev)) != _SUCCESS) {
mutex_unlock(&pwrpriv->mutex_lock); mutex_unlock(&pwrpriv->mutex_lock);
goto error_exit; goto error_exit;
} }
......
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
View file @ 4d7dc178
...@@ -310,7 +310,7 @@ static char *translate_scan(struct adapter *padapter, ...@@ -310,7 +310,7 @@ static char *translate_scan(struct adapter *padapter,
static int wpa_set_auth_algs(struct net_device *dev, u32 value) static int wpa_set_auth_algs(struct net_device *dev, u32 value)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
int ret = 0; int ret = 0;
if ((value & AUTH_ALG_SHARED_KEY) && (value & AUTH_ALG_OPEN_SYSTEM)) { if ((value & AUTH_ALG_SHARED_KEY) && (value & AUTH_ALG_OPEN_SYSTEM)) {
...@@ -344,7 +344,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param, ...@@ -344,7 +344,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
int ret = 0; int ret = 0;
u32 wep_key_idx, wep_key_len, wep_total_len; u32 wep_key_idx, wep_key_len, wep_total_len;
struct ndis_802_11_wep *pwep = NULL; struct ndis_802_11_wep *pwep = NULL;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct security_priv *psecuritypriv = &padapter->securitypriv; struct security_priv *psecuritypriv = &padapter->securitypriv;
...@@ -616,7 +616,7 @@ static int rtw_wx_get_name(struct net_device *dev, ...@@ -616,7 +616,7 @@ static int rtw_wx_get_name(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
u32 ht_ielen = 0; u32 ht_ielen = 0;
char *p; char *p;
u8 ht_cap = false; u8 ht_cap = false;
...@@ -668,7 +668,7 @@ static int rtw_wx_get_freq(struct net_device *dev, ...@@ -668,7 +668,7 @@ static int rtw_wx_get_freq(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network; struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;
...@@ -689,7 +689,7 @@ static int rtw_wx_get_freq(struct net_device *dev, ...@@ -689,7 +689,7 @@ static int rtw_wx_get_freq(struct net_device *dev,
static int rtw_wx_set_mode(struct net_device *dev, struct iw_request_info *a, static int rtw_wx_set_mode(struct net_device *dev, struct iw_request_info *a,
union iwreq_data *wrqu, char *b) union iwreq_data *wrqu, char *b)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
enum ndis_802_11_network_infra networkType; enum ndis_802_11_network_infra networkType;
int ret = 0; int ret = 0;
...@@ -737,7 +737,7 @@ static int rtw_wx_set_mode(struct net_device *dev, struct iw_request_info *a, ...@@ -737,7 +737,7 @@ static int rtw_wx_set_mode(struct net_device *dev, struct iw_request_info *a,
static int rtw_wx_get_mode(struct net_device *dev, struct iw_request_info *a, static int rtw_wx_get_mode(struct net_device *dev, struct iw_request_info *a,
union iwreq_data *wrqu, char *b) union iwreq_data *wrqu, char *b)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, (" rtw_wx_get_mode\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, (" rtw_wx_get_mode\n"));
...@@ -759,7 +759,7 @@ static int rtw_wx_set_pmkid(struct net_device *dev, ...@@ -759,7 +759,7 @@ static int rtw_wx_set_pmkid(struct net_device *dev,
struct iw_request_info *a, struct iw_request_info *a,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
u8 j, blInserted = false; u8 j, blInserted = false;
int ret = false; int ret = false;
struct security_priv *psecuritypriv = &padapter->securitypriv; struct security_priv *psecuritypriv = &padapter->securitypriv;
...@@ -836,7 +836,7 @@ static int rtw_wx_get_range(struct net_device *dev, ...@@ -836,7 +836,7 @@ static int rtw_wx_get_range(struct net_device *dev,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
struct iw_range *range = (struct iw_range *)extra; struct iw_range *range = (struct iw_range *)extra;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
u16 val; u16 val;
...@@ -936,7 +936,7 @@ static int rtw_wx_set_wap(struct net_device *dev, ...@@ -936,7 +936,7 @@ static int rtw_wx_set_wap(struct net_device *dev,
char *extra) char *extra)
{ {
uint ret = 0; uint ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct sockaddr *temp = (struct sockaddr *)awrq; struct sockaddr *temp = (struct sockaddr *)awrq;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct list_head *phead; struct list_head *phead;
...@@ -1001,7 +1001,7 @@ static int rtw_wx_get_wap(struct net_device *dev, ...@@ -1001,7 +1001,7 @@ static int rtw_wx_get_wap(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network; struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;
...@@ -1026,7 +1026,7 @@ static int rtw_wx_set_mlme(struct net_device *dev, ...@@ -1026,7 +1026,7 @@ static int rtw_wx_set_mlme(struct net_device *dev,
{ {
int ret = 0; int ret = 0;
u16 reason; u16 reason;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct iw_mlme *mlme = (struct iw_mlme *)extra; struct iw_mlme *mlme = (struct iw_mlme *)extra;
if (!mlme) if (!mlme)
...@@ -1058,7 +1058,7 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a, ...@@ -1058,7 +1058,7 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
{ {
u8 _status = false; u8 _status = false;
int ret = 0; int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct ndis_802_11_ssid ssid[RTW_SSID_SCAN_AMOUNT]; struct ndis_802_11_ssid ssid[RTW_SSID_SCAN_AMOUNT];
...@@ -1187,7 +1187,7 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a, ...@@ -1187,7 +1187,7 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
struct list_head *plist, *phead; struct list_head *plist, *phead;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct __queue *queue = &pmlmepriv->scanned_queue; struct __queue *queue = &pmlmepriv->scanned_queue;
struct wlan_network *pnetwork = NULL; struct wlan_network *pnetwork = NULL;
...@@ -1255,7 +1255,7 @@ static int rtw_wx_set_essid(struct net_device *dev, ...@@ -1255,7 +1255,7 @@ static int rtw_wx_set_essid(struct net_device *dev,
struct iw_request_info *a, struct iw_request_info *a,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct __queue *queue = &pmlmepriv->scanned_queue; struct __queue *queue = &pmlmepriv->scanned_queue;
struct list_head *phead; struct list_head *phead;
...@@ -1357,7 +1357,7 @@ static int rtw_wx_get_essid(struct net_device *dev, ...@@ -1357,7 +1357,7 @@ static int rtw_wx_get_essid(struct net_device *dev,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
u32 len; u32 len;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network; struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;
...@@ -1462,7 +1462,7 @@ static int rtw_wx_get_rate(struct net_device *dev, ...@@ -1462,7 +1462,7 @@ static int rtw_wx_get_rate(struct net_device *dev,
{ {
u16 max_rate = 0; u16 max_rate = 0;
max_rate = rtw_get_cur_max_rate((struct adapter *)rtw_netdev_priv(dev)); max_rate = rtw_get_cur_max_rate(rtw_netdev_priv(dev));
if (max_rate == 0) if (max_rate == 0)
return -EPERM; return -EPERM;
...@@ -1477,7 +1477,7 @@ static int rtw_wx_set_rts(struct net_device *dev, ...@@ -1477,7 +1477,7 @@ static int rtw_wx_set_rts(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
if (wrqu->rts.disabled) { if (wrqu->rts.disabled) {
padapter->registrypriv.rts_thresh = 2347; padapter->registrypriv.rts_thresh = 2347;
...@@ -1498,7 +1498,7 @@ static int rtw_wx_get_rts(struct net_device *dev, ...@@ -1498,7 +1498,7 @@ static int rtw_wx_get_rts(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
DBG_88E("%s, rts_thresh =%d\n", __func__, padapter->registrypriv.rts_thresh); DBG_88E("%s, rts_thresh =%d\n", __func__, padapter->registrypriv.rts_thresh);
...@@ -1513,7 +1513,7 @@ static int rtw_wx_set_frag(struct net_device *dev, ...@@ -1513,7 +1513,7 @@ static int rtw_wx_set_frag(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
if (wrqu->frag.disabled) { if (wrqu->frag.disabled) {
padapter->xmitpriv.frag_len = MAX_FRAG_THRESHOLD; padapter->xmitpriv.frag_len = MAX_FRAG_THRESHOLD;
...@@ -1534,7 +1534,7 @@ static int rtw_wx_get_frag(struct net_device *dev, ...@@ -1534,7 +1534,7 @@ static int rtw_wx_get_frag(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
DBG_88E("%s, frag_len =%d\n", __func__, padapter->xmitpriv.frag_len); DBG_88E("%s, frag_len =%d\n", __func__, padapter->xmitpriv.frag_len);
...@@ -1565,7 +1565,7 @@ static int rtw_wx_set_enc(struct net_device *dev, ...@@ -1565,7 +1565,7 @@ static int rtw_wx_set_enc(struct net_device *dev,
enum ndis_802_11_auth_mode authmode; enum ndis_802_11_auth_mode authmode;
struct iw_point *erq = &wrqu->encoding; struct iw_point *erq = &wrqu->encoding;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
DBG_88E("+rtw_wx_set_enc, flags = 0x%x\n", erq->flags); DBG_88E("+rtw_wx_set_enc, flags = 0x%x\n", erq->flags);
...@@ -1674,7 +1674,7 @@ static int rtw_wx_get_enc(struct net_device *dev, ...@@ -1674,7 +1674,7 @@ static int rtw_wx_get_enc(struct net_device *dev,
union iwreq_data *wrqu, char *keybuf) union iwreq_data *wrqu, char *keybuf)
{ {
uint key; uint key;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct iw_point *erq = &wrqu->encoding; struct iw_point *erq = &wrqu->encoding;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
...@@ -1749,7 +1749,7 @@ static int rtw_wx_set_gen_ie(struct net_device *dev, ...@@ -1749,7 +1749,7 @@ static int rtw_wx_set_gen_ie(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
return rtw_set_wpa_ie(padapter, extra, wrqu->data.length); return rtw_set_wpa_ie(padapter, extra, wrqu->data.length);
} }
...@@ -1758,7 +1758,7 @@ static int rtw_wx_set_auth(struct net_device *dev, ...@@ -1758,7 +1758,7 @@ static int rtw_wx_set_auth(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct iw_param *param = (struct iw_param *)&wrqu->param; struct iw_param *param = (struct iw_param *)&wrqu->param;
int ret = 0; int ret = 0;
...@@ -1930,7 +1930,7 @@ static int dummy(struct net_device *dev, struct iw_request_info *a, ...@@ -1930,7 +1930,7 @@ static int dummy(struct net_device *dev, struct iw_request_info *a,
static int wpa_set_param(struct net_device *dev, u8 name, u32 value) static int wpa_set_param(struct net_device *dev, u8 name, u32 value)
{ {
uint ret = 0; uint ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
switch (name) { switch (name) {
case IEEE_PARAM_WPA_ENABLED: case IEEE_PARAM_WPA_ENABLED:
...@@ -1985,7 +1985,7 @@ static int wpa_set_param(struct net_device *dev, u8 name, u32 value) ...@@ -1985,7 +1985,7 @@ static int wpa_set_param(struct net_device *dev, u8 name, u32 value)
static int wpa_mlme(struct net_device *dev, u32 command, u32 reason) static int wpa_mlme(struct net_device *dev, u32 command, u32 reason)
{ {
int ret = 0; int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
switch (command) { switch (command) {
case IEEE_MLME_STA_DEAUTH: case IEEE_MLME_STA_DEAUTH:
...@@ -2022,7 +2022,7 @@ static int wpa_supplicant_ioctl(struct net_device *dev, struct iw_point *p) ...@@ -2022,7 +2022,7 @@ static int wpa_supplicant_ioctl(struct net_device *dev, struct iw_point *p)
break; break;
case IEEE_CMD_SET_WPA_IE: case IEEE_CMD_SET_WPA_IE:
ret = rtw_set_wpa_ie((struct adapter *)rtw_netdev_priv(dev), ret = rtw_set_wpa_ie(rtw_netdev_priv(dev),
(char *)param->u.wpa_ie.data, (u16)param->u.wpa_ie.len); (char *)param->u.wpa_ie.data, (u16)param->u.wpa_ie.len);
break; break;
...@@ -2166,7 +2166,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, ...@@ -2166,7 +2166,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,
u32 wep_key_idx, wep_key_len, wep_total_len; u32 wep_key_idx, wep_key_len, wep_total_len;
struct ndis_802_11_wep *pwep = NULL; struct ndis_802_11_wep *pwep = NULL;
struct sta_info *psta = NULL, *pbcmc_sta = NULL; struct sta_info *psta = NULL, *pbcmc_sta = NULL;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct security_priv *psecuritypriv = &padapter->securitypriv; struct security_priv *psecuritypriv = &padapter->securitypriv;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
...@@ -2392,7 +2392,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, ...@@ -2392,7 +2392,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,
static int rtw_set_beacon(struct net_device *dev, struct ieee_param *param, int len) static int rtw_set_beacon(struct net_device *dev, struct ieee_param *param, int len)
{ {
int ret = 0; int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
unsigned char *pbuf = param->u.bcn_ie.buf; unsigned char *pbuf = param->u.bcn_ie.buf;
...@@ -2417,7 +2417,7 @@ static int rtw_set_beacon(struct net_device *dev, struct ieee_param *param, int ...@@ -2417,7 +2417,7 @@ static int rtw_set_beacon(struct net_device *dev, struct ieee_param *param, int
static int rtw_hostapd_sta_flush(struct net_device *dev) static int rtw_hostapd_sta_flush(struct net_device *dev)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
DBG_88E("%s\n", __func__); DBG_88E("%s\n", __func__);
...@@ -2430,7 +2430,7 @@ static int rtw_add_sta(struct net_device *dev, struct ieee_param *param) ...@@ -2430,7 +2430,7 @@ static int rtw_add_sta(struct net_device *dev, struct ieee_param *param)
{ {
int ret = 0; int ret = 0;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
...@@ -2483,7 +2483,7 @@ static int rtw_add_sta(struct net_device *dev, struct ieee_param *param) ...@@ -2483,7 +2483,7 @@ static int rtw_add_sta(struct net_device *dev, struct ieee_param *param)
static int rtw_del_sta(struct net_device *dev, struct ieee_param *param) static int rtw_del_sta(struct net_device *dev, struct ieee_param *param)
{ {
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
int updated = 0; int updated = 0;
...@@ -2518,7 +2518,7 @@ static int rtw_ioctl_get_sta_data(struct net_device *dev, struct ieee_param *par ...@@ -2518,7 +2518,7 @@ static int rtw_ioctl_get_sta_data(struct net_device *dev, struct ieee_param *par
{ {
int ret = 0; int ret = 0;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct ieee_param_ex *param_ex = (struct ieee_param_ex *)param; struct ieee_param_ex *param_ex = (struct ieee_param_ex *)param;
...@@ -2574,7 +2574,7 @@ static int rtw_get_sta_wpaie(struct net_device *dev, struct ieee_param *param) ...@@ -2574,7 +2574,7 @@ static int rtw_get_sta_wpaie(struct net_device *dev, struct ieee_param *param)
{ {
int ret = 0; int ret = 0;
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
...@@ -2610,7 +2610,7 @@ static int rtw_get_sta_wpaie(struct net_device *dev, struct ieee_param *param) ...@@ -2610,7 +2610,7 @@ static int rtw_get_sta_wpaie(struct net_device *dev, struct ieee_param *param)
static int rtw_set_wps_beacon(struct net_device *dev, struct ieee_param *param, int len) static int rtw_set_wps_beacon(struct net_device *dev, struct ieee_param *param, int len)
{ {
unsigned char wps_oui[4] = {0x0, 0x50, 0xf2, 0x04}; unsigned char wps_oui[4] = {0x0, 0x50, 0xf2, 0x04};
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
int ie_len; int ie_len;
...@@ -2645,7 +2645,7 @@ static int rtw_set_wps_beacon(struct net_device *dev, struct ieee_param *param, ...@@ -2645,7 +2645,7 @@ static int rtw_set_wps_beacon(struct net_device *dev, struct ieee_param *param,
static int rtw_set_wps_probe_resp(struct net_device *dev, struct ieee_param *param, int len) static int rtw_set_wps_probe_resp(struct net_device *dev, struct ieee_param *param, int len)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
int ie_len; int ie_len;
...@@ -2674,7 +2674,7 @@ static int rtw_set_wps_probe_resp(struct net_device *dev, struct ieee_param *par ...@@ -2674,7 +2674,7 @@ static int rtw_set_wps_probe_resp(struct net_device *dev, struct ieee_param *par
static int rtw_set_wps_assoc_resp(struct net_device *dev, struct ieee_param *param, int len) static int rtw_set_wps_assoc_resp(struct net_device *dev, struct ieee_param *param, int len)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
int ie_len; int ie_len;
...@@ -2704,7 +2704,7 @@ static int rtw_set_wps_assoc_resp(struct net_device *dev, struct ieee_param *par ...@@ -2704,7 +2704,7 @@ static int rtw_set_wps_assoc_resp(struct net_device *dev, struct ieee_param *par
static int rtw_set_hidden_ssid(struct net_device *dev, struct ieee_param *param, int len) static int rtw_set_hidden_ssid(struct net_device *dev, struct ieee_param *param, int len)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
...@@ -2728,7 +2728,7 @@ static int rtw_set_hidden_ssid(struct net_device *dev, struct ieee_param *param, ...@@ -2728,7 +2728,7 @@ static int rtw_set_hidden_ssid(struct net_device *dev, struct ieee_param *param,
static int rtw_ioctl_acl_remove_sta(struct net_device *dev, struct ieee_param *param, int len) static int rtw_ioctl_acl_remove_sta(struct net_device *dev, struct ieee_param *param, int len)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
if (!check_fwstate(pmlmepriv, WIFI_AP_STATE)) if (!check_fwstate(pmlmepriv, WIFI_AP_STATE))
...@@ -2742,7 +2742,7 @@ static int rtw_ioctl_acl_remove_sta(struct net_device *dev, struct ieee_param *p ...@@ -2742,7 +2742,7 @@ static int rtw_ioctl_acl_remove_sta(struct net_device *dev, struct ieee_param *p
static int rtw_ioctl_acl_add_sta(struct net_device *dev, struct ieee_param *param, int len) static int rtw_ioctl_acl_add_sta(struct net_device *dev, struct ieee_param *param, int len)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
if (!check_fwstate(pmlmepriv, WIFI_AP_STATE)) if (!check_fwstate(pmlmepriv, WIFI_AP_STATE))
...@@ -2756,7 +2756,7 @@ static int rtw_ioctl_acl_add_sta(struct net_device *dev, struct ieee_param *para ...@@ -2756,7 +2756,7 @@ static int rtw_ioctl_acl_add_sta(struct net_device *dev, struct ieee_param *para
static int rtw_ioctl_set_macaddr_acl(struct net_device *dev, struct ieee_param *param, int len) static int rtw_ioctl_set_macaddr_acl(struct net_device *dev, struct ieee_param *param, int len)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
if (!check_fwstate(pmlmepriv, WIFI_AP_STATE)) if (!check_fwstate(pmlmepriv, WIFI_AP_STATE))
...@@ -2771,7 +2771,7 @@ static int rtw_hostapd_ioctl(struct net_device *dev, struct iw_point *p) ...@@ -2771,7 +2771,7 @@ static int rtw_hostapd_ioctl(struct net_device *dev, struct iw_point *p)
{ {
struct ieee_param *param; struct ieee_param *param;
int ret = 0; int ret = 0;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
/* /*
* this function is expect to call in master mode, which allows no power saving * this function is expect to call in master mode, which allows no power saving
...@@ -2853,7 +2853,7 @@ static int rtw_wx_set_priv(struct net_device *dev, ...@@ -2853,7 +2853,7 @@ static int rtw_wx_set_priv(struct net_device *dev,
int ret = 0; int ret = 0;
int len = 0; int len = 0;
char *ext; char *ext;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct iw_point *dwrq = (struct iw_point *)awrq; struct iw_point *dwrq = (struct iw_point *)awrq;
if (dwrq->length == 0) if (dwrq->length == 0)
...@@ -2971,7 +2971,7 @@ static iw_handler rtw_handlers[] = { ...@@ -2971,7 +2971,7 @@ static iw_handler rtw_handlers[] = {
static struct iw_statistics *rtw_get_wireless_stats(struct net_device *dev) static struct iw_statistics *rtw_get_wireless_stats(struct net_device *dev)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = rtw_netdev_priv(dev);
struct iw_statistics *piwstats = &padapter->iwstats; struct iw_statistics *piwstats = &padapter->iwstats;
int tmp_level = 0; int tmp_level = 0;
int tmp_qual = 0; int tmp_qual = 0;
......
drivers/staging/rtl8188eu/os_dep/os_intfs.c
View file @ 4d7dc178
...@@ -187,7 +187,7 @@ static void loadparam(struct adapter *padapter, struct net_device *pnetdev) ...@@ -187,7 +187,7 @@ static void loadparam(struct adapter *padapter, struct net_device *pnetdev)
static int rtw_net_set_mac_address(struct net_device *pnetdev, void *p) static int rtw_net_set_mac_address(struct net_device *pnetdev, void *p)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev); struct adapter *padapter = rtw_netdev_priv(pnetdev);
struct sockaddr *addr = p; struct sockaddr *addr = p;
if (!padapter->bup) if (!padapter->bup)
...@@ -198,7 +198,7 @@ static int rtw_net_set_mac_address(struct net_device *pnetdev, void *p) ...@@ -198,7 +198,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) static struct net_device_stats *rtw_net_get_stats(struct net_device *pnetdev)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev); struct adapter *padapter = rtw_netdev_priv(pnetdev);
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
struct recv_priv *precvpriv = &padapter->recvpriv; struct recv_priv *precvpriv = &padapter->recvpriv;
...@@ -543,7 +543,7 @@ static int _netdev_open(struct net_device *pnetdev) ...@@ -543,7 +543,7 @@ static int _netdev_open(struct net_device *pnetdev)
{ {
uint status; uint status;
int err; int err;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev); struct adapter *padapter = rtw_netdev_priv(pnetdev);
struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv; struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;
RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+88eu_drv - dev_open\n")); RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+88eu_drv - dev_open\n"));
...@@ -612,7 +612,7 @@ static int _netdev_open(struct net_device *pnetdev) ...@@ -612,7 +612,7 @@ static int _netdev_open(struct net_device *pnetdev)
int netdev_open(struct net_device *pnetdev) int netdev_open(struct net_device *pnetdev)
{ {
int ret; int ret;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev); struct adapter *padapter = rtw_netdev_priv(pnetdev);
if (mutex_lock_interruptible(&padapter->hw_init_mutex)) if (mutex_lock_interruptible(&padapter->hw_init_mutex))
return -ERESTARTSYS; return -ERESTARTSYS;
...@@ -698,7 +698,7 @@ void rtw_ips_dev_unload(struct adapter *padapter) ...@@ -698,7 +698,7 @@ void rtw_ips_dev_unload(struct adapter *padapter)
static int netdev_close(struct net_device *pnetdev) static int netdev_close(struct net_device *pnetdev)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev); struct adapter *padapter = rtw_netdev_priv(pnetdev);
RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+88eu_drv - drv_close\n")); RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+88eu_drv - drv_close\n"));
......
drivers/staging/rtl8188eu/os_dep/rtw_android.c
View file @ 4d7dc178
...@@ -76,7 +76,7 @@ int rtw_android_cmdstr_to_num(char *cmdstr) ...@@ -76,7 +76,7 @@ int rtw_android_cmdstr_to_num(char *cmdstr)
static int rtw_android_get_rssi(struct net_device *net, char *command, static int rtw_android_get_rssi(struct net_device *net, char *command,
int total_len) int total_len)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(net); struct adapter *padapter = rtw_netdev_priv(net);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct wlan_network *pcur_network = &pmlmepriv->cur_network; struct wlan_network *pcur_network = &pmlmepriv->cur_network;
int bytes_written = 0; int bytes_written = 0;
...@@ -93,7 +93,7 @@ static int rtw_android_get_rssi(struct net_device *net, char *command, ...@@ -93,7 +93,7 @@ static int rtw_android_get_rssi(struct net_device *net, char *command,
static int rtw_android_get_link_speed(struct net_device *net, char *command, static int rtw_android_get_link_speed(struct net_device *net, char *command,
int total_len) int total_len)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(net); struct adapter *padapter = rtw_netdev_priv(net);
u16 link_speed; u16 link_speed;
link_speed = rtw_get_cur_max_rate(padapter) / 10; link_speed = rtw_get_cur_max_rate(padapter) / 10;
...@@ -111,7 +111,7 @@ static int rtw_android_get_macaddr(struct net_device *net, char *command, ...@@ -111,7 +111,7 @@ static int rtw_android_get_macaddr(struct net_device *net, char *command,
static int android_set_cntry(struct net_device *net, char *command, static int android_set_cntry(struct net_device *net, char *command,
int total_len) int total_len)
{ {
struct adapter *adapter = (struct adapter *)rtw_netdev_priv(net); struct adapter *adapter = rtw_netdev_priv(net);
char *country_code = command + strlen(android_wifi_cmd_str[ANDROID_WIFI_CMD_COUNTRY]) + 1; char *country_code = command + strlen(android_wifi_cmd_str[ANDROID_WIFI_CMD_COUNTRY]) + 1;
int ret; int ret;
......
drivers/staging/rtl8188eu/os_dep/xmit_linux.c
View file @ 4d7dc178
...@@ -164,7 +164,7 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb) ...@@ -164,7 +164,7 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb)
int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev) int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)
{ {
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev); struct adapter *padapter = rtw_netdev_priv(pnetdev);
struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
s32 res = 0; s32 res = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7