Merge git://git.tuxdriver.com/git/netdev-jwl

9 files changed, 29 insertions, 53 deletions

diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 6afc6e5dee9b..340ab4ee4b67 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -4535,9 +4535,8 @@ static int proc_status_open( struct inode *inode, struct file *file ) {
         StatusRid status_rid;
         int i;
 
-        if ((file->private_data = kmalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
+        if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                 return -ENOMEM;
-        memset(file->private_data, 0, sizeof(struct proc_data));
         data = (struct proc_data *)file->private_data;
         if ((data->rbuffer = kmalloc( 2048, GFP_KERNEL )) == NULL) {
                 kfree (file->private_data);
@@ -4615,9 +4614,8 @@ static int proc_stats_rid_open( struct inode *inode,
         int i, j;
         u32 *vals = stats.vals;
 
-        if ((file->private_data = kmalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
+        if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                 return -ENOMEM;
-        memset(file->private_data, 0, sizeof(struct proc_data));
         data = (struct proc_data *)file->private_data;
         if ((data->rbuffer = kmalloc( 4096, GFP_KERNEL )) == NULL) {
                 kfree (file->private_data);
@@ -4881,20 +4879,18 @@ static int proc_config_open( struct inode *inode, struct file *file ) {
         struct airo_info *ai = dev->priv;
         int i;
 
-        if ((file->private_data = kmalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
+        if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                 return -ENOMEM;
-        memset(file->private_data, 0, sizeof(struct proc_data));
         data = (struct proc_data *)file->private_data;
         if ((data->rbuffer = kmalloc( 2048, GFP_KERNEL )) == NULL) {
                 kfree (file->private_data);
                 return -ENOMEM;
         }
-        if ((data->wbuffer = kmalloc( 2048, GFP_KERNEL )) == NULL) {
+        if ((data->wbuffer = kzalloc( 2048, GFP_KERNEL )) == NULL) {
                 kfree (data->rbuffer);
                 kfree (file->private_data);
                 return -ENOMEM;
         }
-        memset( data->wbuffer, 0, 2048 );
         data->maxwritelen = 2048;
         data->on_close = proc_config_on_close;
 
@@ -5155,24 +5151,21 @@ static int proc_wepkey_open( struct inode *inode, struct file *file ) {
         int j=0;
         int rc;
 
-        if ((file->private_data = kmalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
+        if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                 return -ENOMEM;
-        memset(file->private_data, 0, sizeof(struct proc_data));
         memset(&wkr, 0, sizeof(wkr));
         data = (struct proc_data *)file->private_data;
-        if ((data->rbuffer = kmalloc( 180, GFP_KERNEL )) == NULL) {
+        if ((data->rbuffer = kzalloc( 180, GFP_KERNEL )) == NULL) {
                 kfree (file->private_data);
                 return -ENOMEM;
         }
-        memset(data->rbuffer, 0, 180);
         data->writelen = 0;
         data->maxwritelen = 80;
-        if ((data->wbuffer = kmalloc( 80, GFP_KERNEL )) == NULL) {
+        if ((data->wbuffer = kzalloc( 80, GFP_KERNEL )) == NULL) {
                 kfree (data->rbuffer);
                 kfree (file->private_data);
                 return -ENOMEM;
         }
-        memset( data->wbuffer, 0, 80 );
         data->on_close = proc_wepkey_on_close;
 
         ptr = data->rbuffer;
@@ -5203,9 +5196,8 @@ static int proc_SSID_open( struct inode *inode, struct file *file ) {
         char *ptr;
         SsidRid SSID_rid;
 
-        if ((file->private_data = kmalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
+        if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                 return -ENOMEM;
-        memset(file->private_data, 0, sizeof(struct proc_data));
         data = (struct proc_data *)file->private_data;
         if ((data->rbuffer = kmalloc( 104, GFP_KERNEL )) == NULL) {
                 kfree (file->private_data);
@@ -5213,12 +5205,11 @@ static int proc_SSID_open( struct inode *inode, struct file *file ) {
         }
         data->writelen = 0;
         data->maxwritelen = 33*3;
-        if ((data->wbuffer = kmalloc( 33*3, GFP_KERNEL )) == NULL) {
+        if ((data->wbuffer = kzalloc( 33*3, GFP_KERNEL )) == NULL) {
                 kfree (data->rbuffer);
                 kfree (file->private_data);
                 return -ENOMEM;
         }
-        memset( data->wbuffer, 0, 33*3 );
         data->on_close = proc_SSID_on_close;
 
         readSsidRid(ai, &SSID_rid);
@@ -5247,9 +5238,8 @@ static int proc_APList_open( struct inode *inode, struct file *file ) {
         char *ptr;
         APListRid APList_rid;
 
-        if ((file->private_data = kmalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
+        if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                 return -ENOMEM;
-        memset(file->private_data, 0, sizeof(struct proc_data));
         data = (struct proc_data *)file->private_data;
         if ((data->rbuffer = kmalloc( 104, GFP_KERNEL )) == NULL) {
                 kfree (file->private_data);
@@ -5257,12 +5247,11 @@ static int proc_APList_open( struct inode *inode, struct file *file ) {
         }
         data->writelen = 0;
         data->maxwritelen = 4*6*3;
-        if ((data->wbuffer = kmalloc( data->maxwritelen, GFP_KERNEL )) == NULL) {
+        if ((data->wbuffer = kzalloc( data->maxwritelen, GFP_KERNEL )) == NULL) {
                 kfree (data->rbuffer);
                 kfree (file->private_data);
                 return -ENOMEM;
         }
-        memset( data->wbuffer, 0, data->maxwritelen );
         data->on_close = proc_APList_on_close;
 
         readAPListRid(ai, &APList_rid);
@@ -5297,9 +5286,8 @@ static int proc_BSSList_open( struct inode *inode, struct file *file ) {
         /* If doLoseSync is not 1, we won't do a Lose Sync */
         int doLoseSync = -1;
 
-        if ((file->private_data = kmalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
+        if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                 return -ENOMEM;
-        memset(file->private_data, 0, sizeof(struct proc_data));
         data = (struct proc_data *)file->private_data;
         if ((data->rbuffer = kmalloc( 1024, GFP_KERNEL )) == NULL) {
                 kfree (file->private_data);
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index 96ed8da8661d..e328547599dc 100644
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -170,12 +170,11 @@ static dev_link_t *airo_attach(void)
         DEBUG(0, "airo_attach()\n");
 
         /* Initialize the dev_link_t structure */
-        link = kmalloc(sizeof(struct dev_link_t), GFP_KERNEL);
+        link = kzalloc(sizeof(struct dev_link_t), GFP_KERNEL);
         if (!link) {
                 printk(KERN_ERR "airo_cs: no memory for new device\n");
                 return NULL;
         }
-        memset(link, 0, sizeof(struct dev_link_t));
         
         /* Interrupt setup */
         link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
@@ -194,13 +193,12 @@ static dev_link_t *airo_attach(void)
         link->conf.IntType = INT_MEMORY_AND_IO;
         
         /* Allocate space for private device-specific data */
-        local = kmalloc(sizeof(local_info_t), GFP_KERNEL);
+        local = kzalloc(sizeof(local_info_t), GFP_KERNEL);
         if (!local) {
                 printk(KERN_ERR "airo_cs: no memory for new device\n");
                 kfree (link);
                 return NULL;
         }
-        memset(local, 0, sizeof(local_info_t));
         link->priv = local;
         
         /* Register with Card Services */
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 1fbe027d26b6..a3e23527fe7f 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -2217,7 +2217,7 @@ static int atmel_get_range(struct net_device *dev,
         int k,i,j;
 
         dwrq->length = sizeof(struct iw_range);
-        memset(range, 0, sizeof(range));
+        memset(range, 0, sizeof(struct iw_range));
         range->min_nwid = 0x0000;
         range->max_nwid = 0x0000;
         range->num_channels = 0;
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index 195cb36619e8..1bd13146c644 100644
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -180,12 +180,11 @@ static dev_link_t *atmel_attach(void)
         DEBUG(0, "atmel_attach()\n");
 
         /* Initialize the dev_link_t structure */
-        link = kmalloc(sizeof(struct dev_link_t), GFP_KERNEL);
+        link = kzalloc(sizeof(struct dev_link_t), GFP_KERNEL);
         if (!link) {
                 printk(KERN_ERR "atmel_cs: no memory for new device\n");
                 return NULL;
         }
-        memset(link, 0, sizeof(struct dev_link_t));
         
         /* Interrupt setup */
         link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
@@ -204,13 +203,12 @@ static dev_link_t *atmel_attach(void)
         link->conf.IntType = INT_MEMORY_AND_IO;
         
         /* Allocate space for private device-specific data */
-        local = kmalloc(sizeof(local_info_t), GFP_KERNEL);
+        local = kzalloc(sizeof(local_info_t), GFP_KERNEL);
         if (!local) {
                 printk(KERN_ERR "atmel_cs: no memory for new device\n");
                 kfree (link);
                 return NULL;
         }
-        memset(local, 0, sizeof(local_info_t));
         link->priv = local;
         
         /* Register with Card Services */
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index ad7f8cd76db9..4f19ac7d63a8 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -6065,13 +6065,11 @@ static int ipw2100_wpa_set_encryption(struct net_device *dev,
 
                 ieee80211_crypt_delayed_deinit(ieee, crypt);
 
-                new_crypt = (struct ieee80211_crypt_data *)
-                        kmalloc(sizeof(struct ieee80211_crypt_data), GFP_KERNEL);
+                new_crypt = kzalloc(sizeof(struct ieee80211_crypt_data), GFP_KERNEL);
                 if (new_crypt == NULL) {
                         ret = -ENOMEM;
                         goto done;
                 }
-                memset(new_crypt, 0, sizeof(struct ieee80211_crypt_data));
                 new_crypt->ops = ops;
                 if (new_crypt->ops && try_module_get(new_crypt->ops->owner))
                         new_crypt->priv = new_crypt->ops->init(param->u.crypt.idx);
diff --git a/drivers/net/wireless/prism54/isl_38xx.c b/drivers/net/wireless/prism54/isl_38xx.c
index adc7499136dc..866c476933c3 100644
--- a/drivers/net/wireless/prism54/isl_38xx.c
+++ b/drivers/net/wireless/prism54/isl_38xx.c
@@ -112,9 +112,10 @@ isl38xx_handle_wakeup(isl38xx_control_block *control_block,
 void
 isl38xx_trigger_device(int asleep, void __iomem *device_base)
 {
-        u32 reg, counter = 0;
+        u32 reg;
 
 #if VERBOSE > SHOW_ERROR_MESSAGES
+        u32 counter = 0;
         struct timeval current_time;
         DEBUG(SHOW_FUNCTION_CALLS, "isl38xx trigger device\n");
 #endif
@@ -131,7 +132,6 @@ isl38xx_trigger_device(int asleep, void __iomem *device_base)
                       current_time.tv_sec, (long)current_time.tv_usec,
                       readl(device_base + ISL38XX_CTRL_STAT_REG));
 #endif
-                udelay(ISL38XX_WRITEIO_DELAY);
 
                 reg = readl(device_base + ISL38XX_INT_IDENT_REG);
                 if (reg == 0xabadface) {
@@ -145,7 +145,9 @@ isl38xx_trigger_device(int asleep, void __iomem *device_base)
                         while (reg = readl(device_base + ISL38XX_CTRL_STAT_REG),
                                (reg & ISL38XX_CTRL_STAT_SLEEPMODE) == 0) {
                                 udelay(ISL38XX_WRITEIO_DELAY);
+#if VERBOSE > SHOW_ERROR_MESSAGES
                                 counter++;
+#endif
                         }
 
 #if VERBOSE > SHOW_ERROR_MESSAGES
@@ -153,10 +155,6 @@ isl38xx_trigger_device(int asleep, void __iomem *device_base)
                               "%08li.%08li Device register read %08x\n",
                               current_time.tv_sec, (long)current_time.tv_usec,
                               readl(device_base + ISL38XX_CTRL_STAT_REG));
-#endif
-                        udelay(ISL38XX_WRITEIO_DELAY);
-
-#if VERBOSE > SHOW_ERROR_MESSAGES
                         do_gettimeofday(&current_time);
                         DEBUG(SHOW_TRACING,
                               "%08li.%08li Device asleep counter %i\n",
@@ -171,7 +169,6 @@ isl38xx_trigger_device(int asleep, void __iomem *device_base)
 
                 /* perform another read on the Device Status Register */
                 reg = readl(device_base + ISL38XX_CTRL_STAT_REG);
-                udelay(ISL38XX_WRITEIO_DELAY);
 
 #if VERBOSE > SHOW_ERROR_MESSAGES
                 do_gettimeofday(&current_time);
@@ -187,7 +184,6 @@ isl38xx_trigger_device(int asleep, void __iomem *device_base)
 
                 isl38xx_w32_flush(device_base, ISL38XX_DEV_INT_UPDATE,
                                   ISL38XX_DEV_INT_REG);
-                udelay(ISL38XX_WRITEIO_DELAY);
         }
 }
 
diff --git a/drivers/net/wireless/prism54/islpci_eth.c b/drivers/net/wireless/prism54/islpci_eth.c
index fc1eb3564832..a92ce3af3fa9 100644
--- a/drivers/net/wireless/prism54/islpci_eth.c
+++ b/drivers/net/wireless/prism54/islpci_eth.c
@@ -227,17 +227,17 @@ islpci_eth_transmit(struct sk_buff *skb, struct net_device *ndev)
                 priv->data_low_tx_full = 1;
         }
 
+        /* set the transmission time */
+        ndev->trans_start = jiffies;
+        priv->statistics.tx_packets++;
+        priv->statistics.tx_bytes += skb->len;
+
         /* trigger the device */
         islpci_trigger(priv);
 
         /* unlock the driver code */
         spin_unlock_irqrestore(&priv->slock, flags);
 
-        /* set the transmission time */
-        ndev->trans_start = jiffies;
-        priv->statistics.tx_packets++;
-        priv->statistics.tx_bytes += skb->len;
-
         return 0;
 
       drop_free:
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index 4b3c98f5c564..c822cad3333f 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -4608,9 +4608,8 @@ wavelan_attach(void)
 #endif
 
   /* Initialize the dev_link_t structure */
-  link = kmalloc(sizeof(struct dev_link_t), GFP_KERNEL);
+  link = kzalloc(sizeof(struct dev_link_t), GFP_KERNEL);
   if (!link) return NULL;
-  memset(link, 0, sizeof(struct dev_link_t));
 
   /* The io structure describes IO port mapping */
   link->io.NumPorts1 = 8;
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index 3f8c27f0871b..978fdc606781 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -1965,10 +1965,9 @@ static dev_link_t *wl3501_attach(void)
         int ret;
 
         /* Initialize the dev_link_t structure */
-        link = kmalloc(sizeof(*link), GFP_KERNEL);
+        link = kzalloc(sizeof(*link), GFP_KERNEL);
         if (!link)
                 goto out;
-        memset(link, 0, sizeof(struct dev_link_t));
 
         /* The io structure describes IO port mapping */
         link->io.NumPorts1      = 16;