Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn-tx.c
	net/mac80211/sta_info.h

1 files changed, 1 insertions, 51 deletions

diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index c7fd73e3ad76..1ab8861dd43a 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -2234,7 +2234,7 @@ static int b43legacy_chip_init(struct b43legacy_wldev *dev)
         b43legacy_write32(dev, B43legacy_MMIO_DMA5_IRQ_MASK, 0x0000DC00);
 
         value32 = ssb_read32(dev->dev, SSB_TMSLOW);
-        value32 |= 0x00100000;
+        value32 |= B43legacy_TMSLOW_MACPHYCLKEN;
         ssb_write32(dev->dev, SSB_TMSLOW, value32);
 
         b43legacy_write16(dev, B43legacy_MMIO_POWERUP_DELAY,
@@ -3104,37 +3104,6 @@ static void setup_struct_wldev_for_init(struct b43legacy_wldev *dev)
         memset(&dev->noisecalc, 0, sizeof(dev->noisecalc));
 }
 
-static void b43legacy_imcfglo_timeouts_workaround(struct b43legacy_wldev *dev)
-{
-#ifdef CONFIG_SSB_DRIVER_PCICORE
-        struct ssb_bus *bus = dev->dev->bus;
-        u32 tmp;
-
-        if (bus->pcicore.dev &&
-            bus->pcicore.dev->id.coreid == SSB_DEV_PCI &&
-            bus->pcicore.dev->id.revision <= 5) {
-                /* IMCFGLO timeouts workaround. */
-                tmp = ssb_read32(dev->dev, SSB_IMCFGLO);
-                switch (bus->bustype) {
-                case SSB_BUSTYPE_PCI:
-                case SSB_BUSTYPE_PCMCIA:
-                        tmp &= ~SSB_IMCFGLO_REQTO;
-                        tmp &= ~SSB_IMCFGLO_SERTO;
-                        tmp |= 0x32;
-                        break;
-                case SSB_BUSTYPE_SSB:
-                        tmp &= ~SSB_IMCFGLO_REQTO;
-                        tmp &= ~SSB_IMCFGLO_SERTO;
-                        tmp |= 0x53;
-                        break;
-                default:
-                        break;
-                }
-                ssb_write32(dev->dev, SSB_IMCFGLO, tmp);
-        }
-#endif /* CONFIG_SSB_DRIVER_PCICORE */
-}
-
 static void b43legacy_set_synth_pu_delay(struct b43legacy_wldev *dev,
                                           bool idle) {
         u16 pu_delay = 1050;
@@ -3278,7 +3247,6 @@ static int b43legacy_wireless_core_init(struct b43legacy_wldev *dev)
         /* Enable IRQ routing to this device. */
         ssb_pcicore_dev_irqvecs_enable(&bus->pcicore, dev->dev);
 
-        b43legacy_imcfglo_timeouts_workaround(dev);
         prepare_phy_data_for_init(dev);
         b43legacy_phy_calibrate(dev);
         err = b43legacy_chip_init(dev);
@@ -3728,26 +3696,8 @@ static int b43legacy_one_core_attach(struct ssb_device *dev,
                                      struct b43legacy_wl *wl)
 {
         struct b43legacy_wldev *wldev;
-        struct pci_dev *pdev;
         int err = -ENOMEM;
 
-        if (!list_empty(&wl->devlist)) {
-                /* We are not the first core on this chip. */
-                pdev = (dev->bus->bustype == SSB_BUSTYPE_PCI) ? dev->bus->host_pci : NULL;
-                /* Only special chips support more than one wireless
-                 * core, although some of the other chips have more than
-                 * one wireless core as well. Check for this and
-                 * bail out early.
-                 */
-                if (!pdev ||
-                    ((pdev->device != 0x4321) &&
-                     (pdev->device != 0x4313) &&
-                     (pdev->device != 0x431A))) {
-                        b43legacydbg(wl, "Ignoring unconnected 802.11 core\n");
-                        return -ENODEV;
-                }
-        }
-
         wldev = kzalloc(sizeof(*wldev), GFP_KERNEL);
         if (!wldev)
                 goto out;