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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (109 commits)
  [ETHTOOL]: Fix UFO typo
  [SCTP]: Fix persistent slowdown in sctp when a gap ack consumes rx buffer.
  [SCTP]: Send only 1 window update SACK per message.
  [SCTP]: Don't do CRC32C checksum over loopback.
  [SCTP] Reset rtt_in_progress for the chunk when processing its sack.
  [SCTP]: Reject sctp packets with broadcast addresses.
  [SCTP]: Limit association max_retrans setting in setsockopt.
  [PFKEYV2]: Fix inconsistent typing in struct sadb_x_kmprivate.
  [IPV6]: Sum real space for RTAs.
  [IRDA]: Use put_unaligned() in irlmp_do_discovery().
  [BRIDGE]: Add support for NETIF_F_HW_CSUM devices
  [NET]: Add NETIF_F_GEN_CSUM and NETIF_F_ALL_CSUM
  [TG3]: Convert to non-LLTX
  [TG3]: Remove unnecessary tx_lock
  [TCP]: Add tcp_slow_start_after_idle sysctl.
  [BNX2]: Update version and reldate
  [BNX2]: Use CPU native page size
  [BNX2]: Use compressed firmware
  [BNX2]: Add firmware decompression
  [BNX2]: Allow WoL settings on new 5708 chips
  ...

Manual fixup for conflict in drivers/net/tulip/winbond-840.c

1 files changed, 14 insertions, 7 deletions

diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index ff0faab94bd5..8209da5dd15f 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -2074,12 +2074,22 @@ struct tg3 {
 
         /* SMP locking strategy:
          *
-         * lock: Held during all operations except TX packet
-         *       processing.
+         * lock: Held during reset, PHY access, timer, and when
+         *       updating tg3_flags and tg3_flags2.
          *
-         * tx_lock: Held during tg3_start_xmit and tg3_tx
+         * tx_lock: Held during tg3_start_xmit and tg3_tx only
+         *          when calling netif_[start|stop]_queue.
+         *          tg3_start_xmit is protected by netif_tx_lock.
          *
          * Both of these locks are to be held with BH safety.
+         *
+         * Because the IRQ handler, tg3_poll, and tg3_start_xmit
+         * are running lockless, it is necessary to completely
+         * quiesce the chip with tg3_netif_stop and tg3_full_lock
+         * before reconfiguring the device.
+         *
+         * indirect_lock: Held when accessing registers indirectly
+         *                with IRQ disabling.
          */
         spinlock_t                      lock;
         spinlock_t                      indirect_lock;
@@ -2155,11 +2165,7 @@ struct tg3 {
 #define TG3_FLAG_ENABLE_ASF             0x00000020
 #define TG3_FLAG_5701_REG_WRITE_BUG     0x00000040
 #define TG3_FLAG_POLL_SERDES            0x00000080
-#if defined(CONFIG_X86)
 #define TG3_FLAG_MBOX_WRITE_REORDER     0x00000100
-#else
-#define TG3_FLAG_MBOX_WRITE_REORDER     0       /* disables code too */
-#endif
 #define TG3_FLAG_PCIX_TARGET_HWBUG      0x00000200
 #define TG3_FLAG_WOL_SPEED_100MB        0x00000400
 #define TG3_FLAG_WOL_ENABLE             0x00000800
@@ -2172,6 +2178,7 @@ struct tg3 {
 #define TG3_FLAG_PCI_HIGH_SPEED         0x00040000
 #define TG3_FLAG_PCI_32BIT              0x00080000
 #define TG3_FLAG_SRAM_USE_CONFIG        0x00100000
+#define TG3_FLAG_TX_RECOVERY_PENDING    0x00200000
 #define TG3_FLAG_SERDES_WOL_CAP         0x00400000
 #define TG3_FLAG_JUMBO_RING_ENABLE      0x00800000
 #define TG3_FLAG_10_100_ONLY            0x01000000