Update compat-wireless to 2.6.36-5-spn

chromeos/compat-wireless/drivers/net/b44.c

 /* b44.c: Broadcom 44xx/47xx Fast Ethernet device driver.
  *
  * Copyright (C) 2002 David S. Miller (davem@redhat.com)
  * Copyright (C) 2004 Pekka Pietikainen (pp@ee.oulu.fi)
  * Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org)
  * Copyright (C) 2006 Felix Fietkau (nbd@openwrt.org)
  * Copyright (C) 2006 Broadcom Corporation.
  * Copyright (C) 2007 Michael Buesch <mb@bu3sch.de>
  *
  * Distribute under GPL.
@@ skipping 830 matching lines @@
         int work_done;
         unsigned long flags;
 
         spin_lock_irqsave(&bp->lock, flags);
 
         if (bp->istat & (ISTAT_TX | ISTAT_TO)) {
                 /* spin_lock(&bp->tx_lock); */
                 b44_tx(bp);
                 /* spin_unlock(&bp->tx_lock); */
         }
+        if (bp->istat & ISTAT_RFO) {    /* fast recovery, in ~20msec */
+                bp->istat &= ~ISTAT_RFO;
+                b44_disable_ints(bp);
+                ssb_device_enable(bp->sdev, 0); /* resets ISTAT_RFO */
+                b44_init_rings(bp);
+                b44_init_hw(bp, B44_FULL_RESET_SKIP_PHY);
+                netif_wake_queue(bp->dev);
+        }
+
         spin_unlock_irqrestore(&bp->lock, flags);
 
         work_done = 0;
         if (bp->istat & ISTAT_RX)
                 work_done += b44_rx(bp, budget);
 
         if (bp->istat & ISTAT_ERRORS) {
                 spin_lock_irqsave(&bp->lock, flags);
                 b44_halt(bp);
                 b44_init_rings(bp);
@@ skipping 1297 matching lines @@
 
         bp->rx_pending = B44_DEF_RX_RING_PENDING;
         bp->tx_pending = B44_DEF_TX_RING_PENDING;
 
         netdev_attach_ops(dev, &b44_netdev_ops);
         netif_napi_add(dev, &bp->napi, b44_poll, 64);
         dev->watchdog_timeo = B44_TX_TIMEOUT;
         dev->irq = sdev->irq;
         SET_ETHTOOL_OPS(dev, &b44_ethtool_ops);
 
-        netif_carrier_off(dev);
-
         err = ssb_bus_powerup(sdev->bus, 0);
         if (err) {
                 dev_err(sdev->dev,
                         "Failed to powerup the bus\n");
                 goto err_out_free_dev;
         }
 
         if (dma_set_mask(sdev->dma_dev, DMA_BIT_MASK(30)) ||
             dma_set_coherent_mask(sdev->dma_dev, DMA_BIT_MASK(30))) {
                 dev_err(sdev->dev,
@@ skipping 21 matching lines @@
 
         /* By default, auto-negotiate PAUSE. */
         bp->flags |= B44_FLAG_PAUSE_AUTO;
 
         err = register_netdev(dev);
         if (err) {
                 dev_err(sdev->dev, "Cannot register net device, aborting\n");
                 goto err_out_powerdown;
         }
 
+        netif_carrier_off(dev);
+
         ssb_set_drvdata(sdev, dev);
 
         /* Chip reset provides power to the b44 MAC & PCI cores, which
          * is necessary for MAC register access.
          */
         b44_chip_reset(bp, B44_CHIP_RESET_FULL);
 
         /* do a phy reset to test if there is an active phy */
         if (b44_phy_reset(bp) < 0)
                 bp->phy_addr = B44_PHY_ADDR_NO_PHY;
@@ skipping 135 matching lines @@
 
 static void __exit b44_cleanup(void)
 {
         ssb_driver_unregister(&b44_ssb_driver);
         b44_pci_exit();
 }
 
 module_init(b44_init);
 module_exit(b44_cleanup);