lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] usb wifi: zd1201 cleanups

Browse Source 
Cleanup coding style and other small stuff in zd1201. No real code
changes.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Pavel Machek
2006-05-26 22:07:48 +02:00
committed by John W. Linville
parent f6882a0688
commit 2a80634031
1 changed files with 26 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/usb/net/zd1201.c
View File

@@ -33,7 +33,7 @@ static struct usb_device_id zd1201_table[] = {
{} {}
}; };
static int ap = 0; /* Are we an AP or a normal station? */ static int ap; /* Are we an AP or a normal station? */
#define ZD1201_VERSION "0.15" #define ZD1201_VERSION "0.15"
@@ -49,7 +49,7 @@ MODULE_DEVICE_TABLE(usb, zd1201_table);
static int zd1201_fw_upload(struct usb_device *dev, int apfw) static int zd1201_fw_upload(struct usb_device *dev, int apfw)
{ {
const struct firmware *fw_entry; const struct firmware *fw_entry;
char* data; char *data;
unsigned long len; unsigned long len;
int err; int err;
unsigned char ret; unsigned char ret;
@@ -65,7 +65,7 @@ static int zd1201_fw_upload(struct usb_device *dev, int apfw)
if (err) { if (err) {
dev_err(&dev->dev, "Failed to load %s firmware file!\n", fwfile); dev_err(&dev->dev, "Failed to load %s firmware file!\n", fwfile);
dev_err(&dev->dev, "Make sure the hotplug firmware loader is installed.\n"); dev_err(&dev->dev, "Make sure the hotplug firmware loader is installed.\n");
dev_err(&dev->dev, "Goto http://linux-lc100020.sourceforge.net for more info\n"); dev_err(&dev->dev, "Goto http://linux-lc100020.sourceforge.net for more info.\n");
return err; return err;
} }
@@ -316,7 +316,7 @@ static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs)
fc = le16_to_cpu(*(__le16 *)&data[datalen-16]); fc = le16_to_cpu(*(__le16 *)&data[datalen-16]);
seq = le16_to_cpu(*(__le16 *)&data[datalen-24]); seq = le16_to_cpu(*(__le16 *)&data[datalen-24]);
if(zd->monitor) { if (zd->monitor) {
if (datalen < 24) if (datalen < 24)
goto resubmit; goto resubmit;
if (!(skb = dev_alloc_skb(datalen+24))) if (!(skb = dev_alloc_skb(datalen+24)))
@@ -364,7 +364,7 @@ static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs)
goto resubmit; goto resubmit;
} }
hlist_for_each_entry(frag, node, &zd->fraglist, fnode) hlist_for_each_entry(frag, node, &zd->fraglist, fnode)
if(frag->seq == (seq&IEEE80211_SCTL_SEQ)) if (frag->seq == (seq&IEEE80211_SCTL_SEQ))
break; break;
if (!frag) if (!frag)
goto resubmit; goto resubmit;
@@ -376,7 +376,6 @@ static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs)
goto resubmit; goto resubmit;
hlist_del_init(&frag->fnode); hlist_del_init(&frag->fnode);
kfree(frag); kfree(frag);
/* Fallthrough */
} else { } else {
if (datalen<14) if (datalen<14)
goto resubmit; goto resubmit;
@@ -475,7 +474,7 @@ static int zd1201_getconfig(struct zd1201 *zd, int rid, void *riddata,
actual_length = (length > 64) ? 64 : length; actual_length = (length > 64) ? 64 : length;
if(pdata[0] != 0x3) { if (pdata[0] != 0x3) {
dev_dbg(&zd->usb->dev, "Rx Resource packet type error: %02X\n", dev_dbg(&zd->usb->dev, "Rx Resource packet type error: %02X\n",
pdata[0]); pdata[0]);
return -EINVAL; return -EINVAL;
@@ -487,11 +486,10 @@ static int zd1201_getconfig(struct zd1201 *zd, int rid, void *riddata,
} }
/* Skip the 4 bytes header (RID length and RID) */ /* Skip the 4 bytes header (RID length and RID) */
if(i == 0) { if (i == 0) {
pdata += 8; pdata += 8;
actual_length -= 8; actual_length -= 8;
} } else {
else {
pdata += 4; pdata += 4;
actual_length -= 4; actual_length -= 4;
} }
@@ -764,7 +762,6 @@ static int zd1201_net_open(struct net_device *dev)
static int zd1201_net_stop(struct net_device *dev) static int zd1201_net_stop(struct net_device *dev)
{ {
netif_stop_queue(dev); netif_stop_queue(dev);
return 0; return 0;
} }
@@ -915,7 +912,6 @@ static int zd1201_get_name(struct net_device *dev,
struct iw_request_info *info, char *name, char *extra) struct iw_request_info *info, char *name, char *extra)
{ {
strcpy(name, "IEEE 802.11b"); strcpy(name, "IEEE 802.11b");
return 0; return 0;
} }
@@ -1013,11 +1009,10 @@ static int zd1201_set_mode(struct net_device *dev,
if (err) if (err)
return err; return err;
} }
zd->monitor=monitor; zd->monitor = monitor;
/* If monitor mode is set we don't actually turn it on here since it /* If monitor mode is set we don't actually turn it on here since it
* is done during mac reset anyway (see zd1201_mac_enable). * is done during mac reset anyway (see zd1201_mac_enable).
*/ */
zd1201_mac_reset(zd); zd1201_mac_reset(zd);
return 0; return 0;
@@ -1117,7 +1112,7 @@ static int zd1201_get_wap(struct net_device *dev,
zd->iwstats.qual.updated = 2; zd->iwstats.qual.updated = 2;
} }
return zd1201_getconfig(zd,ZD1201_RID_CURRENTBSSID,ap_addr->sa_data,6); return zd1201_getconfig(zd, ZD1201_RID_CURRENTBSSID, ap_addr->sa_data, 6);
} }
static int zd1201_set_scan(struct net_device *dev, static int zd1201_set_scan(struct net_device *dev,
@@ -1529,11 +1524,7 @@ static int zd1201_set_power(struct net_device *dev,
return -EINVAL; return -EINVAL;
} }
out: out:
err = zd1201_setconfig16(zd, ZD1201_RID_CNFPMENABLED, enabled); return zd1201_setconfig16(zd, ZD1201_RID_CNFPMENABLED, enabled);
if (err)
return err;
return 0;
} }
static int zd1201_get_power(struct net_device *dev, static int zd1201_get_power(struct net_device *dev,
@@ -1627,15 +1618,11 @@ static int zd1201_set_hostauth(struct net_device *dev,
struct iw_request_info *info, struct iw_param *rrq, char *extra) struct iw_request_info *info, struct iw_param *rrq, char *extra)
{ {
struct zd1201 *zd = (struct zd1201 *)dev->priv; struct zd1201 *zd = (struct zd1201 *)dev->priv;
int err;
if (!zd->ap) if (!zd->ap)
return -EOPNOTSUPP; return -EOPNOTSUPP;
err = zd1201_setconfig16(zd, ZD1201_RID_CNFHOSTAUTH, rrq->value); return zd1201_setconfig16(zd, ZD1201_RID_CNFHOSTAUTH, rrq->value);
if (err)
return err;
return 0;
} }
static int zd1201_get_hostauth(struct net_device *dev, static int zd1201_get_hostauth(struct net_device *dev,
@@ -1744,7 +1731,7 @@ static int zd1201_probe(struct usb_interface *interface,
{ {
struct zd1201 *zd; struct zd1201 *zd;
struct usb_device *usb; struct usb_device *usb;
int i, err; int err;
short porttype; short porttype;
char buf[IW_ESSID_MAX_SIZE+2]; char buf[IW_ESSID_MAX_SIZE+2];
@@ -1773,9 +1760,7 @@ static int zd1201_probe(struct usb_interface *interface,
if (!zd->rx_urb || !zd->tx_urb) if (!zd->rx_urb || !zd->tx_urb)
goto err_zd; goto err_zd;
for(i = 0; i<100; i++) mdelay(100);
udelay(1000);
err = zd1201_drvr_start(zd); err = zd1201_drvr_start(zd);
if (err) if (err)
goto err_zd; goto err_zd;