Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (55 commits)
  netxen: fix tx ring accounting
  netxen: fix detection of cut-thru firmware mode
  forcedeth: fix dma api mismatches
  atm: sk_wmem_alloc initial value is one
  net: correct off-by-one write allocations reports
  via-velocity : fix no link detection on boot
  Net / e100: Fix suspend of devices that cannot be power managed
  TI DaVinci EMAC : Fix rmmod error
  net: group address list and its count
  ipv4: Fix fib_trie rebalancing, part 2
  pkt_sched: Update drops stats in act_police
  sky2: version 1.23
  sky2: add GRO support
  sky2: skb recycling
  sky2: reduce default transmit ring
  sky2: receive counter update
  sky2: fix shutdown synchronization
  sky2: PCI irq issues
  sky2: more receive shutdown
  sky2: turn off pause during shutdown
  ...

Manually fix trivial conflict in net/core/skbuff.c due to kmemcheck

1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c
index 06a46d7b3d6c..6564282ce476 100644
--- a/drivers/net/wireless/libertas/if_spi.c
+++ b/drivers/net/wireless/libertas/if_spi.c
@@ -812,7 +812,6 @@ out:
 static void if_spi_e2h(struct if_spi_card *card)
 {
         int err = 0;
-        unsigned long flags;
         u32 cause;
         struct lbs_private *priv = card->priv;
 
@@ -827,10 +826,7 @@ static void if_spi_e2h(struct if_spi_card *card)
         /* generate a card interrupt */
         spu_write_u16(card, IF_SPI_CARD_INT_CAUSE_REG, IF_SPI_CIC_HOST_EVENT);
 
-        spin_lock_irqsave(&priv->driver_lock, flags);
         lbs_queue_event(priv, cause & 0xff);
-        spin_unlock_irqrestore(&priv->driver_lock, flags);
-
 out:
         if (err)
                 lbs_pr_err("%s: error %d\n", __func__, err);
@@ -875,7 +871,12 @@ static int lbs_spi_thread(void *data)
                         err = if_spi_c2h_data(card);
                         if (err)
                                 goto err;
-                if (hiStatus & IF_SPI_HIST_CMD_DOWNLOAD_RDY) {
+
+                /* workaround: in PS mode, the card does not set the Command
+                 * Download Ready bit, but it sets TX Download Ready. */
+                if (hiStatus & IF_SPI_HIST_CMD_DOWNLOAD_RDY ||
+                   (card->priv->psstate != PS_STATE_FULL_POWER &&
+                    (hiStatus & IF_SPI_HIST_TX_DOWNLOAD_RDY))) {
                         /* This means two things. First of all,
                          * if there was a previous command sent, the card has
                          * successfully received it.