forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PATCH] orinoco: Change orinoco_translate_scan() to return error code on error.

Browse source 
Signed-off-by: Pavel Roskin <proski@gnu.org>

diff-tree 8fc038ec51acf5f777fade80c5e38112b766aeee (from ca955293cdfd3139e150d3b4fed3922a7eb651fb)
Author: Pavel Roskin <proski@gnu.org>
Date:   Thu Sep 1 19:10:12 2005 -0400

    Change orinoco_translate_scan() to return error code on error.
    Adjust the caller to check for errors and clean up if needed.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
Pavel Roskin 2005-09-01 20:02:50 -04:00 • committed by Jeff Garzik
commit 70817c40b9
1 changed files with 42 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

69
drivers/net/wireless/orinoco.c
View file

@ -4021,7 +4021,8 @@ static int orinoco_ioctl_setscan(struct net_device *dev,
} }
/* Translate scan data returned from the card to a card independant /* Translate scan data returned from the card to a card independant
* format that the Wireless Tools will understand - Jean II */ * format that the Wireless Tools will understand - Jean II
* Return message length or -errno for fatal errors */
static inline int orinoco_translate_scan(struct net_device *dev, static inline int orinoco_translate_scan(struct net_device *dev,
char *buffer, char *buffer,
char *scan, char *scan,
@ -4061,13 +4062,19 @@ static inline int orinoco_translate_scan(struct net_device *dev,
break; break;
case FIRMWARE_TYPE_INTERSIL: case FIRMWARE_TYPE_INTERSIL:
offset = 4; offset = 4;
if (priv->has_hostscan) if (priv->has_hostscan) {
atom_len = scan[0] + (scan[1] << 8); atom_len = le16_to_cpup((u16 *)scan);
else /* Sanity check for atom_len */
if (atom_len < sizeof(struct prism2_scan_apinfo)) {
printk(KERN_ERR "%s: Invalid atom_len in scan data: %d\n",
dev->name, atom_len);
return -EIO;
}
} else
atom_len = offsetof(struct prism2_scan_apinfo, atim); atom_len = offsetof(struct prism2_scan_apinfo, atim);
break; break;
default: default:
return 0; return -EOPNOTSUPP;
} }
/* Check that we got an whole number of atoms */ /* Check that we got an whole number of atoms */
@ -4075,7 +4082,7 @@ static inline int orinoco_translate_scan(struct net_device *dev,
printk(KERN_ERR "%s: Unexpected scan data length %d, " printk(KERN_ERR "%s: Unexpected scan data length %d, "
"atom_len %d, offset %d\n", dev->name, scan_len, "atom_len %d, offset %d\n", dev->name, scan_len,
atom_len, offset); atom_len, offset);
return 0; return -EIO;
} }
/* Read the entries one by one */ /* Read the entries one by one */
@ -4210,33 +4217,41 @@ static int orinoco_ioctl_getscan(struct net_device *dev,
/* We have some results to push back to user space */ /* We have some results to push back to user space */
/* Translate to WE format */ /* Translate to WE format */
srq->length = orinoco_translate_scan(dev, extra, int ret = orinoco_translate_scan(dev, extra,
priv->scan_result, priv->scan_result,
priv->scan_len); priv->scan_len);
/* Return flags */ if (ret < 0) {
srq->flags = (__u16) priv->scan_mode; err = ret;
kfree(priv->scan_result);
priv->scan_result = NULL;
} else {
srq->length = ret;
/* Results are here, so scan no longer in progress */ /* Return flags */
priv->scan_inprogress = 0; srq->flags = (__u16) priv->scan_mode;
/* In any case, Scan results will be cleaned up in the /* In any case, Scan results will be cleaned up in the
* reset function and when exiting the driver. * reset function and when exiting the driver.
* The person triggering the scanning may never come to * The person triggering the scanning may never come to
* pick the results, so we need to do it in those places. * pick the results, so we need to do it in those places.
* Jean II */ * Jean II */
#ifdef SCAN_SINGLE_READ #ifdef SCAN_SINGLE_READ
/* If you enable this option, only one client (the first /* If you enable this option, only one client (the first
* one) will be able to read the result (and only one * one) will be able to read the result (and only one
* time). If there is multiple concurent clients that * time). If there is multiple concurent clients that
* want to read scan results, this behavior is not * want to read scan results, this behavior is not
* advisable - Jean II */ * advisable - Jean II */
kfree(priv->scan_result); kfree(priv->scan_result);
priv->scan_result = NULL; priv->scan_result = NULL;
#endif /* SCAN_SINGLE_READ */ #endif /* SCAN_SINGLE_READ */
/* Here, if too much time has elapsed since last scan, /* Here, if too much time has elapsed since last scan,
* we may want to clean up scan results... - Jean II */ * we may want to clean up scan results... - Jean II */
}
/* Scan is no longer in progress */
priv->scan_inprogress = 0;
} }
orinoco_unlock(priv, &flags); orinoco_unlock(priv, &flags);