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

Conflicts:
	litmus/sched_cedf.c

9 files changed, 90 insertions, 285 deletions

diff --git a/drivers/net/wireless/orinoco/cfg.c b/drivers/net/wireless/orinoco/cfg.c
index 09fae2f0ea08..736bbb9bd1d0 100644
--- a/drivers/net/wireless/orinoco/cfg.c
+++ b/drivers/net/wireless/orinoco/cfg.c
@@ -153,6 +153,9 @@ static int orinoco_scan(struct wiphy *wiphy, struct net_device *dev,
         priv->scan_request = request;
 
         err = orinoco_hw_trigger_scan(priv, request->ssids);
+        /* On error the we aren't processing the request */
+        if (err)
+                priv->scan_request = NULL;
 
         return err;
 }
diff --git a/drivers/net/wireless/orinoco/hw.c b/drivers/net/wireless/orinoco/hw.c
index 077baa86756b..3c7877a7c31c 100644
--- a/drivers/net/wireless/orinoco/hw.c
+++ b/drivers/net/wireless/orinoco/hw.c
@@ -762,14 +762,17 @@ int orinoco_hw_get_act_bitrate(struct orinoco_private *priv, int *bitrate)
         case FIRMWARE_TYPE_INTERSIL: /* Intersil style rate */
         case FIRMWARE_TYPE_SYMBOL: /* Symbol style rate */
                 for (i = 0; i < BITRATE_TABLE_SIZE; i++)
-                        if (bitrate_table[i].intersil_txratectrl == val)
+                        if (bitrate_table[i].intersil_txratectrl == val) {
+                                *bitrate = bitrate_table[i].bitrate * 100000;
                                 break;
+                        }
 
-                if (i >= BITRATE_TABLE_SIZE)
+                if (i >= BITRATE_TABLE_SIZE) {
                         printk(KERN_INFO "%s: Unable to determine current bitrate (0x%04hx)\n",
                                priv->ndev->name, val);
+                        err = -EIO;
+                }
 
-                *bitrate = bitrate_table[i].bitrate * 100000;
                 break;
         default:
                 BUG();
@@ -1028,7 +1031,7 @@ int __orinoco_hw_set_tkip_key(struct orinoco_private *priv, int key_idx,
         else
                 buf.tsc[4] = 0x10;
 
-        /* Wait upto 100ms for tx queue to empty */
+        /* Wait up to 100ms for tx queue to empty */
         for (k = 100; k > 0; k--) {
                 udelay(1000);
                 ret = hermes_read_wordrec(hw, USER_BAP, HERMES_RID_TXQUEUEEMPTY,
diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/orinoco/main.c
index e8e2d0f4763d..62c6b2b37dbe 100644
--- a/drivers/net/wireless/orinoco/main.c
+++ b/drivers/net/wireless/orinoco/main.c
@@ -1376,13 +1376,13 @@ static void orinoco_process_scan_results(struct work_struct *work)
 
         spin_lock_irqsave(&priv->scan_lock, flags);
         list_for_each_entry_safe(sd, temp, &priv->scan_list, list) {
-                spin_unlock_irqrestore(&priv->scan_lock, flags);
 
                 buf = sd->buf;
                 len = sd->len;
                 type = sd->type;
 
                 list_del(&sd->list);
+                spin_unlock_irqrestore(&priv->scan_lock, flags);
                 kfree(sd);
 
                 if (len > 0) {
@@ -1392,10 +1392,9 @@ static void orinoco_process_scan_results(struct work_struct *work)
                                 orinoco_add_hostscan_results(priv, buf, len);
 
                         kfree(buf);
-                } else if (priv->scan_request) {
+                } else {
                         /* Either abort or complete the scan */
-                        cfg80211_scan_done(priv->scan_request, (len < 0));
-                        priv->scan_request = NULL;
+                        orinoco_scan_done(priv, (len < 0));
                 }
 
                 spin_lock_irqsave(&priv->scan_lock, flags);
@@ -1684,6 +1683,8 @@ static int __orinoco_down(struct orinoco_private *priv)
                 hermes_write_regn(hw, EVACK, 0xffff);
         }
 
+        orinoco_scan_done(priv, true);
+
         /* firmware will have to reassociate */
         netif_carrier_off(dev);
         priv->last_linkstatus = 0xffff;
@@ -1762,10 +1763,7 @@ void orinoco_reset(struct work_struct *work)
         orinoco_unlock(priv, &flags);
 
         /* Scanning support: Notify scan cancellation */
-        if (priv->scan_request) {
-                cfg80211_scan_done(priv->scan_request, 1);
-                priv->scan_request = NULL;
-        }
+        orinoco_scan_done(priv, true);
 
         if (priv->hard_reset) {
                 err = (*priv->hard_reset)(priv);
@@ -1813,6 +1811,12 @@ static int __orinoco_commit(struct orinoco_private *priv)
         struct net_device *dev = priv->ndev;
         int err = 0;
 
+        /* If we've called commit, we are reconfiguring or bringing the
+         * interface up. Maintaining countermeasures across this would
+         * be confusing, so note that we've disabled them. The port will
+         * be enabled later in orinoco_commit or __orinoco_up. */
+        priv->tkip_cm_active = 0;
+
         err = orinoco_hw_program_rids(priv);
 
         /* FIXME: what about netif_tx_lock */
diff --git a/drivers/net/wireless/orinoco/orinoco_cs.c b/drivers/net/wireless/orinoco/orinoco_cs.c
index ef46a2d88539..88e3c0ebcaad 100644
--- a/drivers/net/wireless/orinoco/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco/orinoco_cs.c
@@ -17,7 +17,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/delay.h>
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/cisreg.h>
 #include <pcmcia/ds.h>
@@ -93,14 +92,6 @@ orinoco_cs_hard_reset(struct orinoco_private *priv)
 /* PCMCIA stuff                                                     */
 /********************************************************************/
 
-/*
- * This creates an "instance" of the driver, allocating local data
- * structures for one device.  The device is registered with Card
- * Services.
- *
- * The dev_link structure is initialized, but we don't actually
- * configure the card at this point -- we wait until we receive a card
- * insertion event.  */
 static int
 orinoco_cs_probe(struct pcmcia_device *link)
 {
@@ -117,23 +108,9 @@ orinoco_cs_probe(struct pcmcia_device *link)
         card->p_dev = link;
         link->priv = priv;
 
-        /* General socket configuration defaults can go here.  In this
-         * client, we assume very little, and rely on the CIS for
-         * almost everything.  In most clients, many details (i.e.,
-         * number, sizes, and attributes of IO windows) are fixed by
-         * the nature of the device, and can be hard-wired here. */
-        link->conf.Attributes = 0;
-        link->conf.IntType = INT_MEMORY_AND_IO;
-
         return orinoco_cs_config(link);
 }                               /* orinoco_cs_attach */
 
-/*
- * This deletes a driver "instance".  The device is de-registered with
- * Card Services.  If it has been released, all local data structures
- * are freed.  Otherwise, the structures will be freed when the device
- * is released.
- */
 static void orinoco_cs_detach(struct pcmcia_device *link)
 {
         struct orinoco_private *priv = link->priv;
@@ -145,76 +122,12 @@ static void orinoco_cs_detach(struct pcmcia_device *link)
         free_orinocodev(priv);
 }                               /* orinoco_cs_detach */
 
-/*
- * orinoco_cs_config() is scheduled to run after a CARD_INSERTION
- * event is received, to configure the PCMCIA socket, and to make the
- * device available to the system.
- */
-
-static int orinoco_cs_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 orinoco_cs_config_check(struct pcmcia_device *p_dev, void *priv_data)
 {
-        if (cfg->index == 0)
-                goto next_entry;
-
-        /* 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) {
-                        DEBUG(2, "%s: Vcc mismatch (vcc = %d, CIS = %d)\n",
-                              __func__, vcc,
-                              cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);
-                        if (!ignore_cis_vcc)
-                                goto next_entry;
-                }
-        } else if (dflt->vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM] / 10000) {
-                        DEBUG(2, "%s: Vcc mismatch (vcc = %d, CIS = %d)\n",
-                              __func__, vcc,
-                              dflt->vcc.param[CISTPL_POWER_VNOM] / 10000);
-                        if (!ignore_cis_vcc)
-                                goto next_entry;
-                }
-        }
-
-        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 */
-        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->io_lines = io->flags & CISTPL_IO_LINES_MASK;
-                p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
-                p_dev->resource[0]->flags |=
-                        pcmcia_io_cfg_data_width(io->flags);
-                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;
-                }
-
-                /* This reserves IO space but doesn't actually enable it */
-                if (pcmcia_request_io(p_dev) != 0)
-                        goto next_entry;
-        }
-        return 0;
+        if (p_dev->config_index == 0)
+                return -EINVAL;
 
-next_entry:
-        pcmcia_disable_device(p_dev);
-        return -ENODEV;
+        return pcmcia_request_io(p_dev);
 };
 
 static int
@@ -225,20 +138,10 @@ orinoco_cs_config(struct pcmcia_device *link)
         int ret;
         void __iomem *mem;
 
-        /*
-         * In this loop, we scan the CIS for configuration table
-         * entries, each of which describes a valid card
-         * configuration, including voltage, IO window, memory window,
-         * and interrupt settings.
-         *
-         * We make no assumptions about the card to be configured: we
-         * use just the information available in the CIS.  In an ideal
-         * world, this would work for any PCMCIA card, but it requires
-         * a complete and accurate CIS.  In practice, a driver usually
-         * "knows" most of these things without consulting the CIS,
-         * and most client drivers will only use the CIS to fill in
-         * implementation-defined details.
-         */
+        link->config_flags |= CONF_AUTO_SET_VPP | 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, orinoco_cs_config_check, NULL);
         if (ret) {
                 if (!ignore_cis_vcc)
@@ -248,26 +151,21 @@ orinoco_cs_config(struct pcmcia_device *link)
                 goto failed;
         }
 
-        ret = pcmcia_request_irq(link, orinoco_interrupt);
-        if (ret)
-                goto failed;
-
-        /* We initialize the hermes structure before completing PCMCIA
-         * configuration just in case the interrupt handler gets
-         * called. */
         mem = ioport_map(link->resource[0]->start,
                         resource_size(link->resource[0]));
         if (!mem)
                 goto failed;
 
+        /* We initialize the hermes structure before completing PCMCIA
+         * configuration just in case the interrupt handler gets
+         * called. */
         hermes_struct_init(hw, mem, HERMES_16BIT_REGSPACING);
 
-        /*
-         * 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_request_irq(link, orinoco_interrupt);
+        if (ret)
+                goto failed;
+
+        ret = pcmcia_enable_device(link);
         if (ret)
                 goto failed;
 
@@ -291,11 +189,6 @@ orinoco_cs_config(struct pcmcia_device *link)
         return -ENODEV;
 }                               /* orinoco_cs_config */
 
-/*
- * After a card is removed, orinoco_cs_release() will unregister the
- * device, and release the PCMCIA configuration.  If the device is
- * still open, this will be postponed until it is closed.
- */
 static void
 orinoco_cs_release(struct pcmcia_device *link)
 {
@@ -344,13 +237,7 @@ static int orinoco_cs_resume(struct pcmcia_device *link)
 /* Module initialization                                            */
 /********************************************************************/
 
-/* Can't be declared "const" or the whole __initdata section will
- * become const */
-static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION
-        " (David Gibson <hermes@gibson.dropbear.id.au>, "
-        "Pavel Roskin <proski@gnu.org>, et al)";
-
-static struct pcmcia_device_id orinoco_cs_ids[] = {
+static const struct pcmcia_device_id orinoco_cs_ids[] = {
         PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), /* 3Com AirConnect PCI 777A */
         PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002), /* Lucent Orinoco and old Intersil */
         PCMCIA_DEVICE_MANF_CARD(0x016b, 0x0001), /* Ericsson WLAN Card C11 */
@@ -441,9 +328,7 @@ MODULE_DEVICE_TABLE(pcmcia, orinoco_cs_ids);
 
 static struct pcmcia_driver orinoco_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = DRIVER_NAME,
-        },
+        .name           = DRIVER_NAME,
         .probe          = orinoco_cs_probe,
         .remove         = orinoco_cs_detach,
         .id_table       = orinoco_cs_ids,
@@ -454,8 +339,6 @@ static struct pcmcia_driver orinoco_driver = {
 static int __init
 init_orinoco_cs(void)
 {
-        printk(KERN_DEBUG "%s\n", version);
-
         return pcmcia_register_driver(&orinoco_driver);
 }
 
diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c
index a38a7bd25f19..b9aedf18a046 100644
--- a/drivers/net/wireless/orinoco/orinoco_usb.c
+++ b/drivers/net/wireless/orinoco/orinoco_usb.c
@@ -57,7 +57,6 @@
 #include <linux/fcntl.h>
 #include <linux/spinlock.h>
 #include <linux/list.h>
-#include <linux/smp_lock.h>
 #include <linux/usb.h>
 #include <linux/timer.h>
 
diff --git a/drivers/net/wireless/orinoco/scan.c b/drivers/net/wireless/orinoco/scan.c
index 4300d9db7d8c..e99ca1c1e0d8 100644
--- a/drivers/net/wireless/orinoco/scan.c
+++ b/drivers/net/wireless/orinoco/scan.c
@@ -111,6 +111,11 @@ static void orinoco_add_hostscan_result(struct orinoco_private *priv,
 
         freq = ieee80211_dsss_chan_to_freq(le16_to_cpu(bss->a.channel));
         channel = ieee80211_get_channel(wiphy, freq);
+        if (!channel) {
+                printk(KERN_DEBUG "Invalid channel designation %04X(%04X)",
+                        bss->a.channel, freq);
+                return; /* Then ignore it for now */
+        }
         timestamp = 0;
         capability = le16_to_cpu(bss->a.capabilities);
         beacon_interval = le16_to_cpu(bss->a.beacon_interv);
@@ -229,3 +234,11 @@ void orinoco_add_hostscan_results(struct orinoco_private *priv,
                 priv->scan_request = NULL;
         }
 }
+
+void orinoco_scan_done(struct orinoco_private *priv, bool abort)
+{
+        if (priv->scan_request) {
+                cfg80211_scan_done(priv->scan_request, abort);
+                priv->scan_request = NULL;
+        }
+}
diff --git a/drivers/net/wireless/orinoco/scan.h b/drivers/net/wireless/orinoco/scan.h
index 2dc4e046dbdb..27281fb0a6dc 100644
--- a/drivers/net/wireless/orinoco/scan.h
+++ b/drivers/net/wireless/orinoco/scan.h
@@ -16,5 +16,6 @@ void orinoco_add_extscan_result(struct orinoco_private *priv,
 void orinoco_add_hostscan_results(struct orinoco_private *dev,
                                   unsigned char *buf,
                                   size_t len);
+void orinoco_scan_done(struct orinoco_private *priv, bool abort);
 
 #endif /* _ORINOCO_SCAN_H_ */
diff --git a/drivers/net/wireless/orinoco/spectrum_cs.c b/drivers/net/wireless/orinoco/spectrum_cs.c
index 873877e17e1b..81f3673d31d4 100644
--- a/drivers/net/wireless/orinoco/spectrum_cs.c
+++ b/drivers/net/wireless/orinoco/spectrum_cs.c
@@ -25,7 +25,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/delay.h>
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/cisreg.h>
 #include <pcmcia/ds.h>
@@ -154,14 +153,6 @@ spectrum_cs_stop_firmware(struct orinoco_private *priv, int idle)
 /* PCMCIA stuff                                                     */
 /********************************************************************/
 
-/*
- * This creates an "instance" of the driver, allocating local data
- * structures for one device.  The device is registered with Card
- * Services.
- *
- * The dev_link structure is initialized, but we don't actually
- * configure the card at this point -- we wait until we receive a card
- * insertion event.  */
 static int
 spectrum_cs_probe(struct pcmcia_device *link)
 {
@@ -179,23 +170,9 @@ spectrum_cs_probe(struct pcmcia_device *link)
         card->p_dev = link;
         link->priv = priv;
 
-        /* General socket configuration defaults can go here.  In this
-         * client, we assume very little, and rely on the CIS for
-         * almost everything.  In most clients, many details (i.e.,
-         * number, sizes, and attributes of IO windows) are fixed by
-         * the nature of the device, and can be hard-wired here. */
-        link->conf.Attributes = 0;
-        link->conf.IntType = INT_MEMORY_AND_IO;
-
         return spectrum_cs_config(link);
 }                               /* spectrum_cs_attach */
 
-/*
- * This deletes a driver "instance".  The device is de-registered with
- * Card Services.  If it has been released, all local data structures
- * are freed.  Otherwise, the structures will be freed when the device
- * is released.
- */
 static void spectrum_cs_detach(struct pcmcia_device *link)
 {
         struct orinoco_private *priv = link->priv;
@@ -207,76 +184,13 @@ static void spectrum_cs_detach(struct pcmcia_device *link)
         free_orinocodev(priv);
 }                               /* spectrum_cs_detach */
 
-/*
- * spectrum_cs_config() is scheduled to run after a CARD_INSERTION
- * event is received, to configure the PCMCIA socket, and to make the
- * device available to the system.
- */
-
 static int spectrum_cs_config_check(struct pcmcia_device *p_dev,
-                                    cistpl_cftable_entry_t *cfg,
-                                    cistpl_cftable_entry_t *dflt,
-                                    unsigned int vcc,
                                     void *priv_data)
 {
-        if (cfg->index == 0)
-                goto next_entry;
-
-        /* 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) {
-                        DEBUG(2, "%s: Vcc mismatch (vcc = %d, CIS = %d)\n",
-                              __func__, vcc,
-                              cfg->vcc.param[CISTPL_POWER_VNOM] / 10000);
-                        if (!ignore_cis_vcc)
-                                goto next_entry;
-                }
-        } else if (dflt->vcc.present & (1 << CISTPL_POWER_VNOM)) {
-                if (vcc != dflt->vcc.param[CISTPL_POWER_VNOM] / 10000) {
-                        DEBUG(2, "%s: Vcc mismatch (vcc = %d, CIS = %d)\n",
-                              __func__, vcc,
-                              dflt->vcc.param[CISTPL_POWER_VNOM] / 10000);
-                        if (!ignore_cis_vcc)
-                                goto next_entry;
-                }
-        }
+        if (p_dev->config_index == 0)
+                return -EINVAL;
 
-        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 */
-        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->io_lines = io->flags & CISTPL_IO_LINES_MASK;
-                p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
-                p_dev->resource[0]->flags |=
-                        pcmcia_io_cfg_data_width(io->flags);
-                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;
-                }
-
-                /* This reserves IO space but doesn't actually enable it */
-                if (pcmcia_request_io(p_dev) != 0)
-                        goto next_entry;
-        }
-        return 0;
-
-next_entry:
-        pcmcia_disable_device(p_dev);
-        return -ENODEV;
+        return pcmcia_request_io(p_dev);
 };
 
 static int
@@ -287,20 +201,10 @@ spectrum_cs_config(struct pcmcia_device *link)
         int ret;
         void __iomem *mem;
 
-        /*
-         * In this loop, we scan the CIS for configuration table
-         * entries, each of which describes a valid card
-         * configuration, including voltage, IO window, memory window,
-         * and interrupt settings.
-         *
-         * We make no assumptions about the card to be configured: we
-         * use just the information available in the CIS.  In an ideal
-         * world, this would work for any PCMCIA card, but it requires
-         * a complete and accurate CIS.  In practice, a driver usually
-         * "knows" most of these things without consulting the CIS,
-         * and most client drivers will only use the CIS to fill in
-         * implementation-defined details.
-         */
+        link->config_flags |= CONF_AUTO_SET_VPP | 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, spectrum_cs_config_check, NULL);
         if (ret) {
                 if (!ignore_cis_vcc)
@@ -310,27 +214,22 @@ spectrum_cs_config(struct pcmcia_device *link)
                 goto failed;
         }
 
-        ret = pcmcia_request_irq(link, orinoco_interrupt);
-        if (ret)
-                goto failed;
-
-        /* We initialize the hermes structure before completing PCMCIA
-         * configuration just in case the interrupt handler gets
-         * called. */
         mem = ioport_map(link->resource[0]->start,
                         resource_size(link->resource[0]));
         if (!mem)
                 goto failed;
 
+        /* We initialize the hermes structure before completing PCMCIA
+         * configuration just in case the interrupt handler gets
+         * called. */
         hermes_struct_init(hw, mem, HERMES_16BIT_REGSPACING);
         hw->eeprom_pda = true;
 
-        /*
-         * 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_request_irq(link, orinoco_interrupt);
+        if (ret)
+                goto failed;
+
+        ret = pcmcia_enable_device(link);
         if (ret)
                 goto failed;
 
@@ -358,11 +257,6 @@ spectrum_cs_config(struct pcmcia_device *link)
         return -ENODEV;
 }                               /* spectrum_cs_config */
 
-/*
- * After a card is removed, spectrum_cs_release() will unregister the
- * device, and release the PCMCIA configuration.  If the device is
- * still open, this will be postponed until it is closed.
- */
 static void
 spectrum_cs_release(struct pcmcia_device *link)
 {
@@ -407,13 +301,7 @@ spectrum_cs_resume(struct pcmcia_device *link)
 /* Module initialization                                            */
 /********************************************************************/
 
-/* Can't be declared "const" or the whole __initdata section will
- * become const */
-static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION
-        " (Pavel Roskin <proski@gnu.org>,"
-        " David Gibson <hermes@gibson.dropbear.id.au>, et al)";
-
-static struct pcmcia_device_id spectrum_cs_ids[] = {
+static const struct pcmcia_device_id spectrum_cs_ids[] = {
         PCMCIA_DEVICE_MANF_CARD(0x026c, 0x0001), /* Symbol Spectrum24 LA4137 */
         PCMCIA_DEVICE_MANF_CARD(0x0104, 0x0001), /* Socket Communications CF */
         PCMCIA_DEVICE_PROD_ID12("Intel", "PRO/Wireless LAN PC Card", 0x816cc815, 0x6fbf459a), /* 2011B, not 2011 */
@@ -423,9 +311,7 @@ MODULE_DEVICE_TABLE(pcmcia, spectrum_cs_ids);
 
 static struct pcmcia_driver orinoco_driver = {
         .owner          = THIS_MODULE,
-        .drv            = {
-                .name   = DRIVER_NAME,
-        },
+        .name           = DRIVER_NAME,
         .probe          = spectrum_cs_probe,
         .remove         = spectrum_cs_detach,
         .suspend        = spectrum_cs_suspend,
@@ -436,8 +322,6 @@ static struct pcmcia_driver orinoco_driver = {
 static int __init
 init_spectrum_cs(void)
 {
-        printk(KERN_DEBUG "%s\n", version);
-
         return pcmcia_register_driver(&orinoco_driver);
 }
 
diff --git a/drivers/net/wireless/orinoco/wext.c b/drivers/net/wireless/orinoco/wext.c
index cf7be1eb6124..e793679e2e19 100644
--- a/drivers/net/wireless/orinoco/wext.c
+++ b/drivers/net/wireless/orinoco/wext.c
@@ -589,8 +589,15 @@ static int orinoco_ioctl_getrate(struct net_device *dev,
 
         /* If the interface is running we try to find more about the
            current mode */
-        if (netif_running(dev))
-                err = orinoco_hw_get_act_bitrate(priv, &bitrate);
+        if (netif_running(dev)) {
+                int act_bitrate;
+                int lerr;
+
+                /* Ignore errors if we can't get the actual bitrate */
+                lerr = orinoco_hw_get_act_bitrate(priv, &act_bitrate);
+                if (!lerr)
+                        bitrate = act_bitrate;
+        }
 
         orinoco_unlock(priv, &flags);
 
@@ -886,6 +893,14 @@ static int orinoco_ioctl_set_auth(struct net_device *dev,
                  */
                 break;
 
+        case IW_AUTH_MFP:
+                /* Management Frame Protection not supported.
+                 * Only fail if set to required.
+                 */
+                if (param->value == IW_AUTH_MFP_REQUIRED)
+                        ret = -EINVAL;
+                break;
+
         case IW_AUTH_KEY_MGMT:
                 /* wl_lkm implies value 2 == PSK for Hermes I
                  * which ties in with WEXT
@@ -904,10 +919,10 @@ static int orinoco_ioctl_set_auth(struct net_device *dev,
                  */
                 if (param->value) {
                         priv->tkip_cm_active = 1;
-                        ret = hermes_enable_port(hw, 0);
+                        ret = hermes_disable_port(hw, 0);
                 } else {
                         priv->tkip_cm_active = 0;
-                        ret = hermes_disable_port(hw, 0);
+                        ret = hermes_enable_port(hw, 0);
                 }
                 break;