Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (22 commits)
  [PATCH] ibmveth: Fix index increment calculation
  [PATCH] Fix timer race
  [PATCH] Remove useless comment from sb1250
  [PATCH] ucc_geth: changes to ucc_geth driver as a result of qe_lib changes and bugfixes
  [PATCH] sky2: 88E803X transmit lockup
  [PATCH] e1000: Reset all functions after a PCI error
  [PATCH] WAN/pc300: handle, propagate minor errors
  [PATCH] Update smc91x driver with ARM Versatile board info
  [PATCH] wireless: WE-20 compatibility for ESSID and NICKN ioctls
  [PATCH] zd1211rw: fix build-break caused by association race fix
  [PATCH] sotftmac: fix a slab corruption in WEP restricted key association
  [PATCH] airo: check if need to freeze
  [PATCH] wireless: More WE-21 potential overflows...
  [PATCH] zd1201: Possible NULL dereference
  [PATCH] orinoco: fix WE-21 buffer overflow
  [PATCH] airo.c: check returned values
  [PATCH] bcm43xx-softmac: Fix system hang for x86-64 with >1GB RAM
  [PATCH] bcm43xx-softmac: check returned value from pci_enable_device
  [PATCH] softmac: Fix WX and association related races
  [PATCH] bcm43xx: fix race condition in periodic work handler
  ...

11 files changed, 142 insertions, 73 deletions

diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 0a33c8a56e13..efcdaf1c5f73 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -2897,6 +2897,8 @@ static struct net_device *_init_airo_card( unsigned short irq, int port,
                 goto err_out_map;
         }
         ai->wifidev = init_wifidev(ai, dev);
+        if (!ai->wifidev)
+                goto err_out_reg;
 
         set_bit(FLAG_REGISTERED,&ai->flags);
         airo_print_info(dev->name, "MAC enabled %x:%x:%x:%x:%x:%x",
@@ -2908,11 +2910,18 @@ static struct net_device *_init_airo_card( unsigned short irq, int port,
                 for( i = 0; i < MAX_FIDS; i++ )
                         ai->fids[i] = transmit_allocate(ai,AIRO_DEF_MTU,i>=MAX_FIDS/2);
 
-        setup_proc_entry( dev, dev->priv ); /* XXX check for failure */
+        if (setup_proc_entry(dev, dev->priv) < 0)
+                goto err_out_wifi;
+
         netif_start_queue(dev);
         SET_MODULE_OWNER(dev);
         return dev;
 
+err_out_wifi:
+        unregister_netdev(ai->wifidev);
+        free_netdev(ai->wifidev);
+err_out_reg:
+        unregister_netdev(dev);
 err_out_map:
         if (test_bit(FLAG_MPI,&ai->flags) && pci) {
                 pci_free_consistent(pci, PCI_SHARED_LEN, ai->shared, ai->shared_dma);
@@ -3089,7 +3098,8 @@ static int airo_thread(void *data) {
                                                 set_bit(JOB_AUTOWEP, &ai->jobs);
                                                 break;
                                         }
-                                        if (!kthread_should_stop()) {
+                                        if (!kthread_should_stop() &&
+                                            !freezing(current)) {
                                                 unsigned long wake_at;
                                                 if (!ai->expires || !ai->scan_timeout) {
                                                         wake_at = max(ai->expires,
@@ -3101,7 +3111,8 @@ static int airo_thread(void *data) {
                                                 schedule_timeout(wake_at - jiffies);
                                                 continue;
                                         }
-                                } else if (!kthread_should_stop()) {
+                                } else if (!kthread_should_stop() &&
+                                           !freezing(current)) {
                                         schedule();
                                         continue;
                                 }
@@ -4495,91 +4506,128 @@ static int setup_proc_entry( struct net_device *dev,
         apriv->proc_entry = create_proc_entry(apriv->proc_name,
                                               S_IFDIR|airo_perm,
                                               airo_entry);
-        apriv->proc_entry->uid = proc_uid;
-        apriv->proc_entry->gid = proc_gid;
-        apriv->proc_entry->owner = THIS_MODULE;
+        if (!apriv->proc_entry)
+                goto fail;
+        apriv->proc_entry->uid = proc_uid;
+        apriv->proc_entry->gid = proc_gid;
+        apriv->proc_entry->owner = THIS_MODULE;
 
         /* Setup the StatsDelta */
         entry = create_proc_entry("StatsDelta",
                                   S_IFREG | (S_IRUGO&proc_perm),
                                   apriv->proc_entry);
-        entry->uid = proc_uid;
-        entry->gid = proc_gid;
+        if (!entry)
+                goto fail_stats_delta;
+        entry->uid = proc_uid;
+        entry->gid = proc_gid;
         entry->data = dev;
-        entry->owner = THIS_MODULE;
+        entry->owner = THIS_MODULE;
         SETPROC_OPS(entry, proc_statsdelta_ops);
 
         /* Setup the Stats */
         entry = create_proc_entry("Stats",
                                   S_IFREG | (S_IRUGO&proc_perm),
                                   apriv->proc_entry);
-        entry->uid = proc_uid;
-        entry->gid = proc_gid;
+        if (!entry)
+                goto fail_stats;
+        entry->uid = proc_uid;
+        entry->gid = proc_gid;
         entry->data = dev;
-        entry->owner = THIS_MODULE;
+        entry->owner = THIS_MODULE;
         SETPROC_OPS(entry, proc_stats_ops);
 
         /* Setup the Status */
         entry = create_proc_entry("Status",
                                   S_IFREG | (S_IRUGO&proc_perm),
                                   apriv->proc_entry);
-        entry->uid = proc_uid;
-        entry->gid = proc_gid;
+        if (!entry)
+                goto fail_status;
+        entry->uid = proc_uid;
+        entry->gid = proc_gid;
         entry->data = dev;
-        entry->owner = THIS_MODULE;
+        entry->owner = THIS_MODULE;
         SETPROC_OPS(entry, proc_status_ops);
 
         /* Setup the Config */
         entry = create_proc_entry("Config",
                                   S_IFREG | proc_perm,
                                   apriv->proc_entry);
-        entry->uid = proc_uid;
-        entry->gid = proc_gid;
+        if (!entry)
+                goto fail_config;
+        entry->uid = proc_uid;
+        entry->gid = proc_gid;
         entry->data = dev;
-        entry->owner = THIS_MODULE;
+        entry->owner = THIS_MODULE;
         SETPROC_OPS(entry, proc_config_ops);
 
         /* Setup the SSID */
         entry = create_proc_entry("SSID",
                                   S_IFREG | proc_perm,
                                   apriv->proc_entry);
-        entry->uid = proc_uid;
-        entry->gid = proc_gid;
+        if (!entry)
+                goto fail_ssid;
+        entry->uid = proc_uid;
+        entry->gid = proc_gid;
         entry->data = dev;
-        entry->owner = THIS_MODULE;
+        entry->owner = THIS_MODULE;
         SETPROC_OPS(entry, proc_SSID_ops);
 
         /* Setup the APList */
         entry = create_proc_entry("APList",
                                   S_IFREG | proc_perm,
                                   apriv->proc_entry);
-        entry->uid = proc_uid;
-        entry->gid = proc_gid;
+        if (!entry)
+                goto fail_aplist;
+        entry->uid = proc_uid;
+        entry->gid = proc_gid;
         entry->data = dev;
-        entry->owner = THIS_MODULE;
+        entry->owner = THIS_MODULE;
         SETPROC_OPS(entry, proc_APList_ops);
 
         /* Setup the BSSList */
         entry = create_proc_entry("BSSList",
                                   S_IFREG | proc_perm,
                                   apriv->proc_entry);
+        if (!entry)
+                goto fail_bsslist;
         entry->uid = proc_uid;
         entry->gid = proc_gid;
         entry->data = dev;
-        entry->owner = THIS_MODULE;
+        entry->owner = THIS_MODULE;
         SETPROC_OPS(entry, proc_BSSList_ops);
 
         /* Setup the WepKey */
         entry = create_proc_entry("WepKey",
                                   S_IFREG | proc_perm,
                                   apriv->proc_entry);
-        entry->uid = proc_uid;
-        entry->gid = proc_gid;
+        if (!entry)
+                goto fail_wepkey;
+        entry->uid = proc_uid;
+        entry->gid = proc_gid;
         entry->data = dev;
-        entry->owner = THIS_MODULE;
+        entry->owner = THIS_MODULE;
         SETPROC_OPS(entry, proc_wepkey_ops);
 
         return 0;
+
+fail_wepkey:
+        remove_proc_entry("BSSList", apriv->proc_entry);
+fail_bsslist:
+        remove_proc_entry("APList", apriv->proc_entry);
+fail_aplist:
+        remove_proc_entry("SSID", apriv->proc_entry);
+fail_ssid:
+        remove_proc_entry("Config", apriv->proc_entry);
+fail_config:
+        remove_proc_entry("Status", apriv->proc_entry);
+fail_status:
+        remove_proc_entry("Stats", apriv->proc_entry);
+fail_stats:
+        remove_proc_entry("StatsDelta", apriv->proc_entry);
+fail_stats_delta:
+        remove_proc_entry(apriv->proc_name, airo_entry);
+fail:
+        return -ENOMEM;
 }
 
 static int takedown_proc_entry( struct net_device *dev,
@@ -5924,7 +5972,6 @@ static int airo_get_essid(struct net_device *dev,
 
         /* Get the current SSID */
         memcpy(extra, status_rid.SSID, status_rid.SSIDlen);
-        extra[status_rid.SSIDlen] = '\0';
         /* If none, we may want to get the one that was set */
 
         /* Push it out ! */
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 31eed85de60f..0c07b8b7250d 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -1678,11 +1678,9 @@ static int atmel_get_essid(struct net_device *dev,
         /* Get the current SSID */
         if (priv->new_SSID_size != 0) {
                 memcpy(extra, priv->new_SSID, priv->new_SSID_size);
-                extra[priv->new_SSID_size] = '\0';
                 dwrq->length = priv->new_SSID_size;
         } else {
                 memcpy(extra, priv->SSID, priv->SSID_size);
-                extra[priv->SSID_size] = '\0';
                 dwrq->length = priv->SSID_size;
         }
 
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_dma.c b/drivers/net/wireless/bcm43xx/bcm43xx_dma.c
index 76e3aed4b471..978ed099e285 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_dma.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_dma.c
@@ -705,11 +705,30 @@ int bcm43xx_dma_init(struct bcm43xx_private *bcm)
         struct bcm43xx_dmaring *ring;
         int err = -ENOMEM;
         int dma64 = 0;
-        u32 sbtmstatehi;
+        u64 mask = bcm43xx_get_supported_dma_mask(bcm);
+        int nobits;
 
-        sbtmstatehi = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATEHIGH);
-        if (sbtmstatehi & BCM43xx_SBTMSTATEHIGH_DMA64BIT)
+        if (mask == DMA_64BIT_MASK) {
                 dma64 = 1;
+                nobits = 64;
+        } else if (mask == DMA_32BIT_MASK)
+                nobits = 32;
+        else
+                nobits = 30;
+        err = pci_set_dma_mask(bcm->pci_dev, mask);
+        err |= pci_set_consistent_dma_mask(bcm->pci_dev, mask);
+        if (err) {
+#ifdef CONFIG_BCM43XX_PIO
+                printk(KERN_WARNING PFX "DMA not supported on this device."
+                                        " Falling back to PIO.\n");
+                bcm->__using_pio = 1;
+                return -ENOSYS;
+#else
+                printk(KERN_ERR PFX "FATAL: DMA not supported and PIO not configured. "
+                                    "Please recompile the driver with PIO support.\n");
+                return -ENODEV;
+#endif /* CONFIG_BCM43XX_PIO */
+        }
 
         /* setup TX DMA channels. */
         ring = bcm43xx_setup_dmaring(bcm, 0, 1, dma64);
@@ -755,8 +774,7 @@ int bcm43xx_dma_init(struct bcm43xx_private *bcm)
                 dma->rx_ring3 = ring;
         }
 
-        dprintk(KERN_INFO PFX "%s DMA initialized\n",
-                        dma64 ? "64-bit" : "32-bit");
+        dprintk(KERN_INFO PFX "%d-bit DMA initialized\n", nobits);
         err = 0;
 out:
         return err;
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_dma.h b/drivers/net/wireless/bcm43xx/bcm43xx_dma.h
index e04bcaddd1d0..ea16078cfe98 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_dma.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_dma.h
@@ -314,6 +314,23 @@ int bcm43xx_dma_tx(struct bcm43xx_private *bcm,
                    struct ieee80211_txb *txb);
 void bcm43xx_dma_rx(struct bcm43xx_dmaring *ring);
 
+/* Helper function that returns the dma mask for this device. */
+static inline
+u64 bcm43xx_get_supported_dma_mask(struct bcm43xx_private *bcm)
+{
+        int dma64 = bcm43xx_read32(bcm, BCM43xx_CIR_SBTMSTATEHIGH) &
+                                   BCM43xx_SBTMSTATEHIGH_DMA64BIT;
+        u16 mmio_base = bcm43xx_dmacontroller_base(dma64, 0);
+        u32 mask = BCM43xx_DMA32_TXADDREXT_MASK;
+
+        if (dma64)
+                return DMA_64BIT_MASK;
+        bcm43xx_write32(bcm, mmio_base + BCM43xx_DMA32_TXCTL, mask);
+        if (bcm43xx_read32(bcm, mmio_base + BCM43xx_DMA32_TXCTL) & mask)
+                return DMA_32BIT_MASK;
+        return DMA_30BIT_MASK;
+}
+
 #else /* CONFIG_BCM43XX_DMA */
 
 
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_leds.c b/drivers/net/wireless/bcm43xx/bcm43xx_leds.c
index c3f90c8563d9..2ddbec6bf15b 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_leds.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_leds.c
@@ -242,7 +242,7 @@ void bcm43xx_leds_update(struct bcm43xx_private *bcm, int activity)
                         //TODO
                         break;
                 case BCM43xx_LED_ASSOC:
-                        if (bcm->softmac->associated)
+                        if (bcm->softmac->associnfo.associated)
                                 turn_on = 1;
                         break;
 #ifdef CONFIG_BCM43XX_DEBUG
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index bad3452ea893..a94c6d8826f8 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -2925,10 +2925,13 @@ static int bcm43xx_wireless_core_init(struct bcm43xx_private *bcm,
                 bcm43xx_write16(bcm, 0x043C, 0x000C);
 
         if (active_wlcore) {
-                if (bcm43xx_using_pio(bcm))
+                if (bcm43xx_using_pio(bcm)) {
                         err = bcm43xx_pio_init(bcm);
-                else
+                } else {
                         err = bcm43xx_dma_init(bcm);
+                        if (err == -ENOSYS)
+                                err = bcm43xx_pio_init(bcm);
+                }
                 if (err)
                         goto err_chip_cleanup;
         }
@@ -3164,12 +3167,12 @@ static void bcm43xx_periodic_work_handler(void *d)
         u32 savedirqs = 0;
         int badness;
 
+        mutex_lock(&bcm->mutex);
         badness = estimate_periodic_work_badness(bcm->periodic_state);
         if (badness > BADNESS_LIMIT) {
                 /* Periodic work will take a long time, so we want it to
                  * be preemtible.
                  */
-                mutex_lock(&bcm->mutex);
                 netif_tx_disable(bcm->net_dev);
                 spin_lock_irqsave(&bcm->irq_lock, flags);
                 bcm43xx_mac_suspend(bcm);
@@ -3182,7 +3185,6 @@ static void bcm43xx_periodic_work_handler(void *d)
                 /* Periodic work should take short time, so we want low
                  * locking overhead.
                  */
-                mutex_lock(&bcm->mutex);
                 spin_lock_irqsave(&bcm->irq_lock, flags);
         }
 
@@ -3993,8 +3995,6 @@ static int bcm43xx_init_private(struct bcm43xx_private *bcm,
                                 struct net_device *net_dev,
                                 struct pci_dev *pci_dev)
 {
-        int err;
-
         bcm43xx_set_status(bcm, BCM43xx_STAT_UNINIT);
         bcm->ieee = netdev_priv(net_dev);
         bcm->softmac = ieee80211_priv(net_dev);
@@ -4012,22 +4012,8 @@ static int bcm43xx_init_private(struct bcm43xx_private *bcm,
                      (void (*)(unsigned long))bcm43xx_interrupt_tasklet,
                      (unsigned long)bcm);
         tasklet_disable_nosync(&bcm->isr_tasklet);
-        if (modparam_pio) {
+        if (modparam_pio)
                 bcm->__using_pio = 1;
-        } else {
-                err = pci_set_dma_mask(pci_dev, DMA_30BIT_MASK);
-                err |= pci_set_consistent_dma_mask(pci_dev, DMA_30BIT_MASK);
-                if (err) {
-#ifdef CONFIG_BCM43XX_PIO
-                        printk(KERN_WARNING PFX "DMA not supported. Falling back to PIO.\n");
-                        bcm->__using_pio = 1;
-#else
-                        printk(KERN_ERR PFX "FATAL: DMA not supported and PIO not configured. "
-                                            "Recompile the driver with PIO support, please.\n");
-                        return -ENODEV;
-#endif /* CONFIG_BCM43XX_PIO */
-                }
-        }
         bcm->rts_threshold = BCM43xx_DEFAULT_RTS_THRESHOLD;
 
         /* default to sw encryption for now */
@@ -4208,7 +4194,11 @@ static int bcm43xx_resume(struct pci_dev *pdev)
         dprintk(KERN_INFO PFX "Resuming...\n");
 
         pci_set_power_state(pdev, 0);
-        pci_enable_device(pdev);
+        err = pci_enable_device(pdev);
+        if (err) {
+                printk(KERN_ERR PFX "Failure with pci_enable_device!\n");
+                return err;
+        }
         pci_restore_state(pdev);
 
         bcm43xx_chipset_attach(bcm);
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
index 9b7b15cf6561..d27016f8c736 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_wx.c
@@ -847,7 +847,7 @@ static struct iw_statistics *bcm43xx_get_wireless_stats(struct net_device *net_d
         unsigned long flags;
 
         wstats = &bcm->stats.wstats;
-        if (!mac->associated) {
+        if (!mac->associnfo.associated) {
                 wstats->miss.beacon = 0;
 //              bcm->ieee->ieee_stats.tx_retry_limit_exceeded = 0; // FIXME: should this be cleared here?
                 wstats->discard.retries = 0;
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c
index b779c7dcc1a8..336cabac13b3 100644
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@ -2457,6 +2457,7 @@ void free_orinocodev(struct net_device *dev)
 /* Wireless extensions                                              */
 /********************************************************************/
 
+/* Return : < 0 -> error code ; >= 0 -> length */
 static int orinoco_hw_get_essid(struct orinoco_private *priv, int *active,
                                 char buf[IW_ESSID_MAX_SIZE+1])
 {
@@ -2501,9 +2502,9 @@ static int orinoco_hw_get_essid(struct orinoco_private *priv, int *active,
         len = le16_to_cpu(essidbuf.len);
         BUG_ON(len > IW_ESSID_MAX_SIZE);
 
-        memset(buf, 0, IW_ESSID_MAX_SIZE+1);
+        memset(buf, 0, IW_ESSID_MAX_SIZE);
         memcpy(buf, p, len);
-        buf[len] = '\0';
+        err = len;
 
  fail_unlock:
         orinoco_unlock(priv, &flags);
@@ -3027,17 +3028,18 @@ static int orinoco_ioctl_getessid(struct net_device *dev,
 
         if (netif_running(dev)) {
                 err = orinoco_hw_get_essid(priv, &active, essidbuf);
-                if (err)
+                if (err < 0)
                         return err;
+                erq->length = err;
         } else {
                 if (orinoco_lock(priv, &flags) != 0)
                         return -EBUSY;
-                memcpy(essidbuf, priv->desired_essid, IW_ESSID_MAX_SIZE + 1);
+                memcpy(essidbuf, priv->desired_essid, IW_ESSID_MAX_SIZE);
+                erq->length = strlen(priv->desired_essid);
                 orinoco_unlock(priv, &flags);
         }
 
         erq->flags = 1;
-        erq->length = strlen(essidbuf);
 
         return 0;
 }
@@ -3075,10 +3077,10 @@ static int orinoco_ioctl_getnick(struct net_device *dev,
         if (orinoco_lock(priv, &flags) != 0)
                 return -EBUSY;
 
-        memcpy(nickbuf, priv->nick, IW_ESSID_MAX_SIZE+1);
+        memcpy(nickbuf, priv->nick, IW_ESSID_MAX_SIZE);
         orinoco_unlock(priv, &flags);
 
-        nrq->length = strlen(nickbuf);
+        nrq->length = strlen(priv->nick);
 
         return 0;
 }
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 0b381d77015c..7fbfc9e41d07 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -1198,7 +1198,6 @@ static int ray_get_essid(struct net_device *dev,
 
         /* Get the essid that was set */
         memcpy(extra, local->sparm.b5.a_current_ess_id, IW_ESSID_MAX_SIZE);
-        extra[IW_ESSID_MAX_SIZE] = '\0';
 
         /* Push it out ! */
         dwrq->length = strlen(extra);
diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c
index 30057a335a7b..36b29ff05814 100644
--- a/drivers/net/wireless/zd1201.c
+++ b/drivers/net/wireless/zd1201.c
@@ -193,10 +193,8 @@ static void zd1201_usbrx(struct urb *urb)
         struct sk_buff *skb;
         unsigned char type;
 
-        if (!zd) {
-                free = 1;
-                goto exit;
-        }
+        if (!zd)
+                return;
 
         switch(urb->status) {
                 case -EILSEQ:
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 2d12837052b0..a7d29bddb298 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -1099,7 +1099,7 @@ static void link_led_handler(void *p)
         int r;
 
         spin_lock_irq(&mac->lock);
-        is_associated = sm->associated != 0;
+        is_associated = sm->associnfo.associated != 0;
         spin_unlock_irq(&mac->lock);
 
         r = zd_chip_control_leds(chip,