Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (52 commits)
  netxen: do_rom_fast_write error handling
  natsemi: Fix detection of vanilla natsemi cards
  net: remove a collection of unneeded #undef REALLY_SLOW_IO stuff
  chelsio: Fix non-NAPI compile
  cxgb3 - Feed Rx free list with pages
  cxgb3 - Recovery from HW starvation of response queue entries.
  cxgb3 - Unmap offload packets when they are freed
  cxgb3 - FW version update
  cxgb3 - private ioctl cleanup
  cxgb3 - manage sysfs attributes per port
  S2IO: Restoring the mac address in s2io_reset
  S2IO: Avoid printing the Enhanced statistics for Xframe I card.
  S2IO: Making LED off during LINK_DOWN notification.
  S2IO: Added a loadable parameter to enable or disable vlan stripping in frame.
  S2IO: Optimized the delay to wait for command completion
  S2IO: Fixes for MSI and MSIX
  qla3xxx: Bumping driver version number
  qla3xxx: Kernic Panic on pSeries under stress conditions
  qla3xxx: bugfix tx reset after stress conditions.
  qla3xxx: Check return code from pci_map_single() in ql_release_to_lrg_buf_free_list(), ql_populate_free_queue(), ql_alloc_large_buffers(), and ql3xxx_send()
  ...

37 files changed, 1679 insertions, 814 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 06d2087be6bf..35e0a648422d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3177,8 +3177,8 @@ L:	linux-kernel@vger.kernel.org ?
 S:      Supported
 
 SPIDERNET NETWORK DRIVER for CELL
-P:      Jim Lewis
-M:      jim@jklewis.com
+P:      Linas Vepstas
+M:      linas@austin.ibm.com
 L:      netdev@vger.kernel.org
 S:      Supported
 
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 38ac6796fc48..5ff0922e628c 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2245,7 +2245,7 @@ config BNX2
 
 config SPIDER_NET
         tristate "Spider Gigabit Ethernet driver"
-        depends on PCI && PPC_IBM_CELL_BLADE
+        depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB)
         select FW_LOADER
         help
           This driver supports the Gigabit Ethernet chips present on the
diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c
index 89a682702fa9..326d4a665123 100644
--- a/drivers/net/chelsio/sge.c
+++ b/drivers/net/chelsio/sge.c
@@ -1696,6 +1696,7 @@ irqreturn_t t1_interrupt(int irq, void *cookie)
 {
         int work_done;
         struct adapter *adapter = cookie;
+        struct respQ *Q = &adapter->sge->respQ;
 
         spin_lock(&adapter->async_lock);
 
diff --git a/drivers/net/cxgb3/adapter.h b/drivers/net/cxgb3/adapter.h
index 5c97a64451ce..80c3d8f268a7 100644
--- a/drivers/net/cxgb3/adapter.h
+++ b/drivers/net/cxgb3/adapter.h
@@ -74,6 +74,11 @@ enum {				/* adapter flags */
 struct rx_desc;
 struct rx_sw_desc;
 
+struct sge_fl_page {
+        struct skb_frag_struct frag;
+        unsigned char *va;
+};
+
 struct sge_fl {                 /* SGE per free-buffer list state */
         unsigned int buf_size;  /* size of each Rx buffer */
         unsigned int credits;   /* # of available Rx buffers */
@@ -81,11 +86,13 @@ struct sge_fl {			/* SGE per free-buffer list state */
         unsigned int cidx;      /* consumer index */
         unsigned int pidx;      /* producer index */
         unsigned int gen;       /* free list generation */
+        unsigned int cntxt_id;  /* SGE context id for the free list */
+        struct sge_fl_page page;
         struct rx_desc *desc;   /* address of HW Rx descriptor ring */
         struct rx_sw_desc *sdesc;       /* address of SW Rx descriptor ring */
         dma_addr_t phys_addr;   /* physical address of HW ring start */
-        unsigned int cntxt_id;  /* SGE context id for the free list */
         unsigned long empty;    /* # of times queue ran out of buffers */
+        unsigned long alloc_failed; /* # of times buffer allocation failed */
 };
 
 /*
@@ -121,6 +128,8 @@ struct sge_rspq {		/* state for an SGE response queue */
         unsigned long empty;    /* # of times queue ran out of credits */
         unsigned long nomem;    /* # of responses deferred due to no mem */
         unsigned long unhandled_irqs;   /* # of spurious intrs */
+        unsigned long starved;
+        unsigned long restarted;
 };
 
 struct tx_desc;
diff --git a/drivers/net/cxgb3/cxgb3_ioctl.h b/drivers/net/cxgb3/cxgb3_ioctl.h
index a94281861a66..0a82fcddf2d8 100644
--- a/drivers/net/cxgb3/cxgb3_ioctl.h
+++ b/drivers/net/cxgb3/cxgb3_ioctl.h
@@ -36,28 +36,17 @@
  * Ioctl commands specific to this driver.
  */
 enum {
-        CHELSIO_SETREG = 1024,
-        CHELSIO_GETREG,
-        CHELSIO_SETTPI,
-        CHELSIO_GETTPI,
-        CHELSIO_GETMTUTAB,
-        CHELSIO_SETMTUTAB,
-        CHELSIO_GETMTU,
-        CHELSIO_SET_PM,
-        CHELSIO_GET_PM,
-        CHELSIO_GET_TCAM,
-        CHELSIO_SET_TCAM,
-        CHELSIO_GET_TCB,
-        CHELSIO_GET_MEM,
-        CHELSIO_LOAD_FW,
-        CHELSIO_GET_PROTO,
-        CHELSIO_SET_PROTO,
-        CHELSIO_SET_TRACE_FILTER,
-        CHELSIO_SET_QSET_PARAMS,
-        CHELSIO_GET_QSET_PARAMS,
-        CHELSIO_SET_QSET_NUM,
-        CHELSIO_GET_QSET_NUM,
-        CHELSIO_SET_PKTSCHED,
+        CHELSIO_GETMTUTAB               = 1029,
+        CHELSIO_SETMTUTAB               = 1030,
+        CHELSIO_SET_PM                  = 1032,
+        CHELSIO_GET_PM                  = 1033,
+        CHELSIO_GET_MEM                 = 1038,
+        CHELSIO_LOAD_FW                 = 1041,
+        CHELSIO_SET_TRACE_FILTER        = 1044,
+        CHELSIO_SET_QSET_PARAMS         = 1045,
+        CHELSIO_GET_QSET_PARAMS         = 1046,
+        CHELSIO_SET_QSET_NUM            = 1047,
+        CHELSIO_GET_QSET_NUM            = 1048,
 };
 
 struct ch_reg {
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index 43583ed655ab..7ff834e45d6b 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -434,27 +434,25 @@ static int setup_sge_qsets(struct adapter *adap)