Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

8 files changed, 36 insertions, 118 deletions

diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c
index dbb986946e1a..3d05dc15c6b8 100644
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
@@ -858,7 +858,10 @@ void hostap_free_data(struct ap_data *ap)
                 return;
         }
 
+        flush_work_sync(&ap->add_sta_proc_queue);
+
 #ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
+        flush_work_sync(&ap->wds_oper_queue);
         if (ap->crypt)
                 ap->crypt->deinit(ap->crypt_priv);
         ap->crypt = ap->crypt_priv = NULL;
@@ -2356,7 +2359,7 @@ int prism2_ap_get_sta_qual(local_info_t *local, struct sockaddr addr[],
 }
 
 
-/* Translate our list of Access Points & Stations to a card independant
+/* Translate our list of Access Points & Stations to a card independent
  * format that the Wireless Tools will understand - Jean II */
 int prism2_ap_translate_scan(struct net_device *dev,
                              struct iw_request_info *info, char *buffer)
diff --git a/drivers/net/wireless/hostap/hostap_ap.h b/drivers/net/wireless/hostap/hostap_ap.h
index 655ceeba9612..334e2d0b8e11 100644
--- a/drivers/net/wireless/hostap/hostap_ap.h
+++ b/drivers/net/wireless/hostap/hostap_ap.h
@@ -114,7 +114,7 @@ struct sta_info {
  * has passed since last received frame from the station, a nullfunc data
  * frame is sent to the station. If this frame is not acknowledged and no other
  * frames have been received, the station will be disassociated after
- * AP_DISASSOC_DELAY. Similarily, a the station will be deauthenticated after
+ * AP_DISASSOC_DELAY. Similarly, a the station will be deauthenticated after
  * AP_DEAUTH_DELAY. AP_TIMEOUT_RESOLUTION is the resolution that is used with
  * max inactivity timer. */
 #define AP_MAX_INACTIVITY_SEC (5 * 60)
diff --git a/drivers/net/wireless/hostap/hostap_config.h b/drivers/net/wireless/hostap/hostap_config.h
index 30acd39d76a2..2c8f71f0ed45 100644
--- a/drivers/net/wireless/hostap/hostap_config.h
+++ b/drivers/net/wireless/hostap/hostap_config.h
@@ -30,9 +30,9 @@
 
 /* Following defines can be used to remove unneeded parts of the driver, e.g.,
  * to limit the size of the kernel module. Definitions can be added here in
- * hostap_config.h or they can be added to make command with EXTRA_CFLAGS,
+ * hostap_config.h or they can be added to make command with ccflags-y,
  * e.g.,
- * 'make pccard EXTRA_CFLAGS="-DPRISM2_NO_DEBUG -DPRISM2_NO_PROCFS_DEBUG"'
+ * 'make pccard ccflags-y="-DPRISM2_NO_DEBUG -DPRISM2_NO_PROCFS_DEBUG"'
  */
 
 /* Do not include debug messages into the driver */
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index ba54d1b04d22..c052a0d5cbdd 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -12,7 +12,6 @@
 #include <linux/wireless.h>
 #include <net/iw_handler.h>
 
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/cisreg.h>
 #include <pcmcia/ds.h>
@@ -437,7 +436,6 @@ static int hostap_cs_probe(struct pcmcia_device *p_dev)
         int ret;
 
         PDEBUG(DEBUG_HW, "%s: setting Vcc=33 (constant)\n", dev_info);
-        p_dev->conf.IntType = INT_MEMORY_AND_IO;
 
         ret = prism2_config(p_dev);
         if (ret) {
@@ -468,74 +466,11 @@ static void prism2_detach(struct pcmcia_device *link)
 }
 
 
-/* run after a CARD_INSERTION event is received to configure the PCMCIA
- * socket and make the device available to the system */
-
-static int prism2_config_check(struct pcmcia_device *p_dev,
-                               cistpl_cftable_entry_t *cfg,
-                               cistpl_cftable_entry_t *dflt,
-                               unsigned int vcc,
-                               void *priv_data)
+static int prism2_config_check(struct pcmcia_device *p_dev, void *priv_data)
 {
-        if (cfg->index == 0)
-                return -ENODEV;
-
-        PDEBUG(DEBUG_EXTRA, "Checking CFTABLE_ENTRY 0x%02X "
-               "(default 0x%02X)\n", cfg->index, dflt->index);
-
-        /* Does this card need audio output? */
-        if (cfg->flags & CISTPL_CFTABLE_AUDIO) {
-                p_dev->conf.Attributes |= CONF_ENABLE_SPKR;
-                p_dev->conf.Status = CCSR_AUDIO_ENA;
-        }
-
-        /* Use power settings for Vcc and Vpp if present */
-        /*  Note that the CIS values need to be rescaled */
-        if (cfg->vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                if (vcc != cfg->vcc.param[CISTPL_POWER_VNOM] /
-                    10000 && !ignore_cis_vcc) {
-                        PDEBUG(DEBUG_EXTRA, "  Vcc mismatch - skipping"
-                               " this entry\n");
-                        return -ENODEV;
-                }
-        } else if (dflt->vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM] /
-                    10000 && !ignore_cis_vcc) {
-                        PDEBUG(DEBUG_EXTRA, "  Vcc (default) mismatch "
-                               "- skipping this entry\n");
-                        return -ENODEV;
-                }
-        }
-
-        if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
-                p_dev->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
-        else if (dflt->vpp1.present & (1 << CISTPL_POWER_VNOM))
-                p_dev->conf.Vpp = dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000;
-
-        /* Do we need to allocate an interrupt? */
-        p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
-
-        /* IO window settings */
-        PDEBUG(DEBUG_EXTRA, "IO window settings: cfg->io.nwin=%d "
-               "dflt->io.nwin=%d\n",
-               cfg->io.nwin, dflt->io.nwin);
-        p_dev->resource[0]->end = p_dev->resource[1]->end = 0;
-        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
-                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
-                p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
-                p_dev->resource[0]->flags |=
-                                        pcmcia_io_cfg_data_width(io->flags);
-                p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
-                p_dev->resource[0]->start = io->win[0].base;
-                p_dev->resource[0]->end = io->win[0].len;
-                if (io->nwin > 1) {
-                        p_dev->resource[1]->flags = p_dev->resource[0]->flags;
-                        p_dev->resource[1]->start = io->win[1].base;
-                        p_dev->resource[1]->end = io->win[1].len;
-                }
-        }
+        if (p_dev->config_index == 0)
+                return -EINVAL;
 
-        /* This reserves IO space but doesn't actually enable it */
         return pcmcia_request_io(p_dev);
 }
 
@@ -557,6 +492,10 @@ static int prism2_config(struct pcmcia_device *link)
         }
 
         /* Look for an appropriate configuration table entry in the CIS */
+        link->config_flags |= CONF_AUTO_SET_VPP | CONF_AUTO_AUDIO |
+                CONF_AUTO_CHECK_VCC | CONF_AUTO_SET_IO | CONF_ENABLE_IRQ;
+        if (ignore_cis_vcc)
+                link->config_flags &= ~CONF_AUTO_CHECK_VCC;
         ret = pcmcia_loop_config(link, prism2_config_check, NULL);
         if (ret) {
                 if (!ignore_cis_vcc)
@@ -579,43 +518,23 @@ static int prism2_config(struct pcmcia_device *link)
         hw_priv->link = link;
 
         /*
-         * Make sure the IRQ handler cannot proceed until at least
-         * dev->base_addr is initialized.
+         * We enable IRQ here, but IRQ handler will not proceed
+         * until dev->base_addr is set below. This protect us from
+         * receive interrupts when driver is not initialized.
          */
-        spin_lock_irqsave(&local->irq_init_lock, flags);
-
         ret = pcmcia_request_irq(link, prism2_interrupt);
         if (ret)
-                goto failed_unlock;
+                goto failed;
 
-        /*
-         * This actually configures the PCMCIA socket -- setting up
-         * the I/O windows and the interrupt mapping, and putting the
-         * card and host interface into "Memory and IO" mode.
-         */
-        ret = pcmcia_request_configuration(link, &link->conf);
+        ret = pcmcia_enable_device(link);
         if (ret)
-                goto failed_unlock;
+                goto failed;
 
+        spin_lock_irqsave(&local->irq_init_lock, flags);
         dev->irq = link->irq;
         dev->base_addr = link->resource[0]->start;
-
         spin_unlock_irqrestore(&local->irq_init_lock, flags);
 
-        /* Finally, report what we've done */
-        printk(KERN_INFO "%s: index 0x%02x: ",
-               dev_info, link->conf.ConfigIndex);
-        if (link->conf.Vpp)
-                printk(", Vpp %d.%d", link->conf.Vpp / 10,
-                       link->conf.Vpp % 10);
-        if (link->conf.Attributes & CONF_ENABLE_IRQ)
-                printk(", irq %d", link->irq);
-        if (link->resource[0])
-                printk(" & %pR", link->resource[0]);
-        if (link->resource[1])
-                printk(" & %pR", link->resource[1]);
-        printk("\n");
-
         local->shutdown = 0;
 
         sandisk_enable_wireless(dev);
@@ -626,8 +545,6 @@ static int prism2_config(struct pcmcia_device *link)
 
         return ret;
 
- failed_unlock:
-         spin_unlock_irqrestore(&local->irq_init_lock, flags);
  failed:
         kfree(hw_priv);
         prism2_release((u_long)link);
@@ -703,7 +620,7 @@ static int hostap_cs_resume(struct pcmcia_device *link)
         return 0;
 }
 
-static struct pcmcia_device_id hostap_cs_ids[] = {
+static const struct pcmcia_device_id hostap_cs_ids[] = {
         PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100),
         PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300),
         PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777),
@@ -779,9 +696,7 @@ MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);
 
 
 static struct pcmcia_driver hostap_driver = {
-        .drv            = {
-                .name   = "hostap_cs",
-        },
+        .name           = "hostap_cs",
         .probe          = hostap_cs_probe,
         .remove         = prism2_detach,
         .owner          = THIS_MODULE,
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index e9d9d622a9b0..a8bddd81b4d1 100644
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -2621,7 +2621,7 @@ static irqreturn_t prism2_interrupt(int irq, void *dev_id)
         iface = netdev_priv(dev);
         local = iface->local;
 
-        /* Detect early interrupt before driver is fully configued */
+        /* Detect early interrupt before driver is fully configured */
         spin_lock(&local->irq_init_lock);
         if (!dev->base_addr) {
                 if (net_ratelimit()) {
@@ -3317,7 +3317,13 @@ static void prism2_free_local_data(struct net_device *dev)
 
         unregister_netdev(local->dev);
 
-        flush_scheduled_work();
+        flush_work_sync(&local->reset_queue);
+        flush_work_sync(&local->set_multicast_list_queue);
+        flush_work_sync(&local->set_tim_queue);
+#ifndef PRISM2_NO_STATION_MODES
+        flush_work_sync(&local->info_queue);
+#endif
+        flush_work_sync(&local->comms_qual_update);
 
         lib80211_crypt_info_free(&local->crypt_info);
 
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index a85e43a8d758..12de46407c71 100644
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -1696,7 +1696,7 @@ static int prism2_request_scan(struct net_device *dev)
                 hostap_set_word(dev, HFA384X_RID_CNFROAMINGMODE,
                                 HFA384X_ROAMING_FIRMWARE);
 
-        return 0;
+        return ret;
 }
 
 #else /* !PRISM2_NO_STATION_MODES */
@@ -1945,7 +1945,7 @@ static char * __prism2_translate_scan(local_info_t *local,
 }
 
 
-/* Translate scan data returned from the card to a card independant
+/* Translate scan data returned from the card to a card independent
  * format that the Wireless Tools will understand - Jean II */
 static inline int prism2_translate_scan(local_info_t *local,
                                         struct iw_request_info *info,
@@ -2043,7 +2043,7 @@ static inline int prism2_ioctl_giwscan_sta(struct net_device *dev,
                  * until results are ready for various reasons.
                  * First, managing wait queues is complex and racy
                  * (there may be multiple simultaneous callers).
-                 * Second, we grab some rtnetlink lock before comming
+                 * Second, we grab some rtnetlink lock before coming
                  * here (in dev_ioctl()).
                  * Third, the caller can wait on the Wireless Event
                  * - Jean II */
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
index 25a2722c8a98..d5084829c9e5 100644
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -79,13 +79,8 @@ struct net_device * hostap_add_interface(struct local_info *local,
         if (!rtnl_locked)
                 rtnl_lock();
 
-        ret = 0;
-        if (strchr(dev->name, '%'))
-                ret = dev_alloc_name(dev, dev->name);
-
         SET_NETDEV_DEV(dev, mdev->dev.parent);
-        if (ret >= 0)
-                ret = register_netdevice(dev);
+        ret = register_netdevice(dev);
 
         if (!rtnl_locked)
                 rtnl_unlock();
@@ -891,7 +886,6 @@ void hostap_setup_dev(struct net_device *dev, local_info_t *local,
 
         SET_ETHTOOL_OPS(dev, &prism2_ethtool_ops);
 
-        netif_stop_queue(dev);
 }
 
 static int hostap_enable_hostapd(local_info_t *local, int rtnl_locked)
diff --git a/drivers/net/wireless/hostap/hostap_wlan.h b/drivers/net/wireless/hostap/hostap_wlan.h
index 1c66b3c1030d..88dc6a52bdf1 100644
--- a/drivers/net/wireless/hostap/hostap_wlan.h
+++ b/drivers/net/wireless/hostap/hostap_wlan.h
@@ -853,7 +853,7 @@ struct local_info {
         struct work_struct comms_qual_update;
 
         /* RSSI to dBm adjustment (for RX descriptor fields) */
-        int rssi_to_dBm; /* substract from RSSI to get approximate dBm value */
+        int rssi_to_dBm; /* subtract from RSSI to get approximate dBm value */
 
         /* BSS list / protected by local->lock */
         struct list_head bss_list;