Skip to content

Commit

Permalink
[PATCH] libertas: sparse fixes
Browse files Browse the repository at this point in the history
Fix various issues reported by sparse.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Dan Williams authored and John W. Linville committed May 11, 2007
1 parent 12a4d26 commit c4aa705
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions drivers/net/wireless/libertas/ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
struct iwreq *wrq = (struct iwreq *)req;
static struct cmd_ds_fwt_access fwt_access;
int ret;

Expand All @@ -695,7 +696,7 @@ static int wlan_fwt_cleanup_ioctl(wlan_private * priv, struct ifreq *req)
(void *)&fwt_access);

if (ret == 0)
req->ifr_data = (char *)(le32_to_cpu(fwt_access.references));
wrq->u.param.value = le32_to_cpu(fwt_access.references);
else
return -EFAULT;

Expand All @@ -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)
{
struct iwreq *wrq = (struct iwreq *)req;
static struct cmd_ds_fwt_access fwt_access;
int ret;

Expand All @@ -726,7 +728,7 @@ static int wlan_fwt_time_ioctl(wlan_private * priv, struct ifreq *req)
(void *)&fwt_access);

if (ret == 0)
req->ifr_data = (char *)(le32_to_cpu(fwt_access.references));
wrq->u.param.value = le32_to_cpu(fwt_access.references);
else
return -EFAULT;

Expand All @@ -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)
{
struct iwreq *wrq = (struct iwreq *)req;
struct cmd_ds_mesh_access mesh_access;
int ret;

Expand All @@ -754,9 +757,8 @@ static int wlan_mesh_get_ttl_ioctl(wlan_private * priv, struct ifreq *req)
cmd_option_waitforrsp, 0,
(void *)&mesh_access);

if (ret == 0) {
req->ifr_data = (char *)(le32_to_cpu(mesh_access.data[0]));
}
if (ret == 0)
wrq->u.param.value = le32_to_cpu(mesh_access.data[0]);
else
return -EFAULT;

Expand Down Expand Up @@ -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
* after 4 bytes sits the payload.
*/
subcmd = wrq->u.data.flags; //from wpa_supplicant subcmd

subcmd = wrq->u.data.flags;
if (!subcmd)
subcmd = (int)req->ifr_data; //from iwpriv subcmd
subcmd = (int)wrq->u.param.value;

switch (subcmd) {
case WLANSETREGION:
Expand Down Expand Up @@ -887,7 +888,7 @@ int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
break;

case WLAN_SETNONE_GETONEINT:
switch ((int)req->ifr_data) {
switch (wrq->u.param.value) {
case WLANGETREGION:
pdata = (int *)wrq->u.name;
*pdata = (int)adapter->regioncode;
Expand Down

0 comments on commit c4aa705

Please sign in to comment.