evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PATCH] libertas: sparse fixes

Browse source 
Fix various issues reported by sparse.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Dan Williams 2007-05-10 23:09:33 -04:00 • committed by John W. Linville
parent 12a4d265e5
commit c4aa7051b6
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/net/wireless/libertas/ioctl.c
View file

@ -680,6 +680,7 @@ static int wlan_fwt_list_neighbor_ioctl(wlan_private * priv, struct ifreq *req)
*/ */
static int wlan_fwt_cleanup_ioctl(wlan_private * priv, struct ifreq *req) static int wlan_fwt_cleanup_ioctl(wlan_private * priv, struct ifreq *req)
{ {
struct iwreq *wrq = (struct iwreq *)req;
static struct cmd_ds_fwt_access fwt_access; static struct cmd_ds_fwt_access fwt_access;
int ret; int ret;
@ -695,7 +696,7 @@ static int wlan_fwt_cleanup_ioctl(wlan_private * priv, struct ifreq *req)
(void *)&fwt_access); (void *)&fwt_access);
if (ret == 0) if (ret == 0)
req->ifr_data = (char *)(le32_to_cpu(fwt_access.references)); wrq->u.param.value = le32_to_cpu(fwt_access.references);
else else
return -EFAULT; return -EFAULT;
@ -711,6 +712,7 @@ static int wlan_fwt_cleanup_ioctl(wlan_private * priv, struct ifreq *req)
*/ */
static int wlan_fwt_time_ioctl(wlan_private * priv, struct ifreq *req) static int wlan_fwt_time_ioctl(wlan_private * priv, struct ifreq *req)
{ {
struct iwreq *wrq = (struct iwreq *)req;
static struct cmd_ds_fwt_access fwt_access; static struct cmd_ds_fwt_access fwt_access;
int ret; int ret;
@ -726,7 +728,7 @@ static int wlan_fwt_time_ioctl(wlan_private * priv, struct ifreq *req)
(void *)&fwt_access); (void *)&fwt_access);
if (ret == 0) if (ret == 0)
req->ifr_data = (char *)(le32_to_cpu(fwt_access.references)); wrq->u.param.value = le32_to_cpu(fwt_access.references);
else else
return -EFAULT; return -EFAULT;
@ -742,6 +744,7 @@ static int wlan_fwt_time_ioctl(wlan_private * priv, struct ifreq *req)
*/ */
static int wlan_mesh_get_ttl_ioctl(wlan_private * priv, struct ifreq *req) static int wlan_mesh_get_ttl_ioctl(wlan_private * priv, struct ifreq *req)
{ {
struct iwreq *wrq = (struct iwreq *)req;
struct cmd_ds_mesh_access mesh_access; struct cmd_ds_mesh_access mesh_access;
int ret; int ret;
@ -754,9 +757,8 @@ static int wlan_mesh_get_ttl_ioctl(wlan_private * priv, struct ifreq *req)
cmd_option_waitforrsp, 0, cmd_option_waitforrsp, 0,
(void *)&mesh_access); (void *)&mesh_access);
if (ret == 0) { if (ret == 0)
req->ifr_data = (char *)(le32_to_cpu(mesh_access.data[0])); wrq->u.param.value = le32_to_cpu(mesh_access.data[0]);
}
else else
return -EFAULT; return -EFAULT;
@ -832,10 +834,9 @@ int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
/* The first 4 bytes of req->ifr_data is sub-ioctl number /* The first 4 bytes of req->ifr_data is sub-ioctl number
* after 4 bytes sits the payload. * after 4 bytes sits the payload.
*/ */
subcmd = wrq->u.data.flags; //from wpa_supplicant subcmd subcmd = wrq->u.data.flags;
if (!subcmd) if (!subcmd)
subcmd = (int)req->ifr_data; //from iwpriv subcmd subcmd = (int)wrq->u.param.value;
switch (subcmd) { switch (subcmd) {
case WLANSETREGION: case WLANSETREGION:
@ -887,7 +888,7 @@ int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
break; break;
case WLAN_SETNONE_GETONEINT: case WLAN_SETNONE_GETONEINT:
switch ((int)req->ifr_data) { switch (wrq->u.param.value) {
case WLANGETREGION: case WLANGETREGION:
pdata = (int *)wrq->u.name; pdata = (int *)wrq->u.name;
*pdata = (int)adapter->regioncode; *pdata = (int)adapter->regioncode;