Commit ce270020 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
  ...
parents 6c1586bc f8dfdd5c

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -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

drivers/net/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/net/chelsio/sge.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

drivers/net/cxgb3/adapter.h

+10 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/cxgb3/cxgb3_ioctl.h

+11 −22
Original line number Diff line number Diff line
@@ -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 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE