Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (39 commits)
  [INET]: Small possible memory leak in FIB rules
  [NETNS]: init dev_base_lock only once
  [UNIX]: The unix_nr_socks limit can be exceeded
  [AF_UNIX]: Convert socks to unix_socks in scan_inflight, not in callbacks
  [AF_UNIX]: Make unix_tot_inflight counter non-atomic
  [AF_PACKET]: Allow multicast traffic to be caught by ORIGDEV when bonded
  ssb: Fix PCMCIA-host lowlevel bus access
  mac80211: fix MAC80211_RCSIMPLE Kconfig
  mac80211: make "decrypt failed" messages conditional upon MAC80211_DEBUG
  mac80211: use IW_AUTH_PRIVACY_INVOKED rather than IW_AUTH_KEY_MGMT
  mac80211: remove unused driver ops
  mac80211: remove ieee80211_common.h
  softmac: MAINTAINERS update
  rfkill: Fix sparse warning
  rfkill: Use mutex_lock() at register and add sanity check
  iwlwifi: select proper rate control algorithm
  mac80211: allow driver to ask for a rate control algorithm
  mac80211: don't allow registering the same rate control twice
  rfkill: Use subsys_initcall
  mac80211: make simple rate control algorithm built-in
  ...

45 files changed, 380 insertions, 428 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 6a9702726239..cad0882754a6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3454,15 +3454,10 @@ L:	lm-sensors@lm-sensors.org
 S:      Maintained
 
 SOFTMAC LAYER (IEEE 802.11)
-P:      Johannes Berg
-M:      johannes@sipsolutions.net
-P:      Joe Jezak
-M:      josejx@gentoo.org
 P:      Daniel Drake
 M:      dsd@gentoo.org
-W:      http://softmac.sipsolutions.net/
 L:      linux-wireless@vger.kernel.org
-S:      Maintained
+S:      Obsolete
 
 SOFTWARE RAID (Multiple Disks) SUPPORT
 P:      Ingo Molnar
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 4f22a7174caf..be7c9f42a340 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -8354,6 +8354,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         }
         SET_IEEE80211_DEV(hw, &pdev->dev);
 
+        hw->rate_control_algorithm = "iwl-3945-rs";
+
         IWL_DEBUG_INFO("*** LOAD DRIVER ***\n");
         priv = hw->priv;
         priv->hw = hw;
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index d60adcb9bd4a..6757c6c1b25a 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -8955,6 +8955,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         }
         SET_IEEE80211_DEV(hw, &pdev->dev);
 
+        hw->rate_control_algorithm = "iwl-4965-rs";
+
         IWL_DEBUG_INFO("*** LOAD DRIVER ***\n");
         priv = hw->priv;
         priv->hw = hw;
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index c12a741b5574..85a20546e827 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -440,6 +440,7 @@ static int ssb_devices_register(struct ssb_bus *bus)
                         break;
                 case SSB_BUSTYPE_PCMCIA:
 #ifdef CONFIG_SSB_PCMCIAHOST
+                        sdev->irq = bus->host_pcmcia->irq.AssignedIRQ;
                         dev->parent = &bus->host_pcmcia->dev;
 #endif
                         break;
@@ -1147,7 +1148,10 @@ static int __init ssb_modinit(void)
 
         return err;
 }
-subsys_initcall(ssb_modinit);
+/* ssb must be initialized after PCI but before the ssb drivers.
+ * That means we must use some initcall between subsys_initcall
+ * and device_initcall. */
+fs_initcall(ssb_modinit);
 
 static void __exit ssb_modexit(void)
 {
diff --git a/drivers/ssb/pcmcia.c b/drivers/ssb/pcmcia.c
index b6abee846f02..bb44a76b3eb5 100644
--- a/drivers/ssb/pcmcia.c
+++ b/drivers/ssb/pcmcia.c
@@ -63,17 +63,17 @@ int ssb_pcmcia_switch_coreidx(struct ssb_bus *bus,
                 err = pcmcia_access_configuration_register(pdev, &reg);
                 if (err != CS_SUCCESS)
                         goto error;
-                read_addr |= (reg.Value & 0xF) << 12;
+                read_addr |= ((u32)(reg.Value & 0x0F)) << 12;
                 reg.Offset = 0x30;
                 err = pcmcia_access_configuration_register(pdev, &reg);
                 if (err != CS_SUCCESS)
                         goto error;
-                read_addr |= reg.Value << 16;
+                read_addr |= ((u32)reg.Value) << 16;
                 reg.Offset = 0x32;
                 err = pcmcia_access_configuration_register(pdev, &reg);
                 if (err != CS_SUCCESS)
                         goto error;
-                read_addr |= reg.Value << 24;
+                read_addr |= ((u32)reg.Value) << 24;
 
                 cur_core = (read_addr - SSB_ENUM_BASE) / SSB_CORE_SIZE;
                 if (cur_core == coreidx)
@@ -152,28 +152,29 @@ error:
         goto out_unlock;
 }
 
-/* These are the main device register access functions.
- * do_select_core is inline to have the likely hotpath inline.
- * All unlikely codepaths are out-of-line. */
-static inline int do_select_core(struct ssb_bus *bus,
-                                 struct ssb_device *dev,
-                                 u16 *offset)
+static int select_core_and_segment(struct ssb_device *dev,
+                                   u16 *offset)
 {
+        struct ssb_bus *bus = dev->bus;
         int err;