Commit 205c911d 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:
  sis900 warning fixes
  mv643xx_eth: Place explicit port number in mv643xx_eth_platform_data
  pcnet32: Fix PCnet32 performance bug on non-coherent architecutres
  __devinit & __devexit cleanups for de2104x driver
  3c59x: Handle pci_enable_device() failure while resuming
  dmfe: Fix link detection
  dmfe: fix two bugs
  dmfe: trivial/spelling fixes
  revert "drivers/net/tulip/dmfe: support basic carrier detection"
  ucc_geth: returns NETDEV_TX_BUSY when BD ring is full
  ucc_geth: Fix BD processing
  natsemi: netpoll fixes
  bonding: Improve IGMP join processing
  bonding: only receive ARPs for us
  bonding: fix double dev_add_pack
parents c7276fde f3be9742

arch/mips/momentum/jaguar_atx/platform.c

+7 −1
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ static struct resource mv64x60_eth0_resources[] = { 
};



static struct mv643xx_eth_platform_data eth0_pd = {

	.port_number	= 0,



	.tx_sram_addr	= MV_SRAM_BASE_ETH0,

	.tx_sram_size	= MV_SRAM_TXRING_SIZE,

	.tx_queue_size	= MV_SRAM_TXRING_SIZE / 16,
@@ -77,6 +79,8 @@ static struct resource mv64x60_eth1_resources[] = { 
};



static struct mv643xx_eth_platform_data eth1_pd = {

	.port_number	= 1,



	.tx_sram_addr	= MV_SRAM_BASE_ETH1,

	.tx_sram_size	= MV_SRAM_TXRING_SIZE,

	.tx_queue_size	= MV_SRAM_TXRING_SIZE / 16,
@@ -105,7 +109,9 @@ static struct resource mv64x60_eth2_resources[] = { 
	},

};



static struct mv643xx_eth_platform_data eth2_pd;

static struct mv643xx_eth_platform_data eth2_pd = {

	.port_number	= 2,

};



static struct platform_device eth2_device = {

	.name		= MV643XX_ETH_NAME,

arch/mips/momentum/ocelot_3/platform.c

+7 −1
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ static struct resource mv64x60_eth0_resources[] = { 
};



static struct mv643xx_eth_platform_data eth0_pd = {

	.port_number	= 0,



	.tx_sram_addr	= MV_SRAM_BASE_ETH0,

	.tx_sram_size	= MV_SRAM_TXRING_SIZE,

	.tx_queue_size	= MV_SRAM_TXRING_SIZE / 16,
@@ -77,6 +79,8 @@ static struct resource mv64x60_eth1_resources[] = { 
};



static struct mv643xx_eth_platform_data eth1_pd = {

	.port_number	= 1,



	.tx_sram_addr	= MV_SRAM_BASE_ETH1,

	.tx_sram_size	= MV_SRAM_TXRING_SIZE,

	.tx_queue_size	= MV_SRAM_TXRING_SIZE / 16,
@@ -105,7 +109,9 @@ static struct resource mv64x60_eth2_resources[] = { 
	},

};



static struct mv643xx_eth_platform_data eth2_pd;

static struct mv643xx_eth_platform_data eth2_pd = {

	.port_number	= 2,

};



static struct platform_device eth2_device = {

	.name		= MV643XX_ETH_NAME,

arch/mips/momentum/ocelot_c/platform.c

+4 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ static struct resource mv64x60_eth0_resources[] = { 
};



static struct mv643xx_eth_platform_data eth0_pd = {

	.port_number	= 0,



	.tx_sram_addr	= MV_SRAM_BASE_ETH0,

	.tx_sram_size	= MV_SRAM_TXRING_SIZE,

	.tx_queue_size	= MV_SRAM_TXRING_SIZE / 16,
@@ -76,6 +78,8 @@ static struct resource mv64x60_eth1_resources[] = { 
};



static struct mv643xx_eth_platform_data eth1_pd = {

	.port_number	= 1,



	.tx_sram_addr	= MV_SRAM_BASE_ETH1,

	.tx_sram_size	= MV_SRAM_TXRING_SIZE,

	.tx_queue_size	= MV_SRAM_TXRING_SIZE / 16,

arch/powerpc/platforms/chrp/pegasos_eth.c

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ static struct resource mv643xx_eth0_resources[] = { 




static struct mv643xx_eth_platform_data eth0_pd = {

	.port_number	= 0,

	.tx_sram_addr = PEGASOS2_SRAM_BASE_ETH0,

	.tx_sram_size = PEGASOS2_SRAM_TXRING_SIZE,

	.tx_queue_size = PEGASOS2_SRAM_TXRING_SIZE/16,
@@ -87,6 +88,7 @@ static struct resource mv643xx_eth1_resources[] = { 
};



static struct mv643xx_eth_platform_data eth1_pd = {

	.port_number	= 1,

	.tx_sram_addr = PEGASOS2_SRAM_BASE_ETH1,

	.tx_sram_size = PEGASOS2_SRAM_TXRING_SIZE,

	.tx_queue_size = PEGASOS2_SRAM_TXRING_SIZE/16,

arch/ppc/syslib/mv64x60.c

+9 −3
Original line number Diff line number Diff line
@@ -339,7 +339,9 @@ static struct resource mv64x60_eth0_resources[] = { 
	},

};



static struct mv643xx_eth_platform_data eth0_pd;

static struct mv643xx_eth_platform_data eth0_pd = {

	.port_number	= 0,

};



static struct platform_device eth0_device = {

	.name		= MV643XX_ETH_NAME,
@@ -362,7 +364,9 @@ static struct resource mv64x60_eth1_resources[] = { 
	},

};



static struct mv643xx_eth_platform_data eth1_pd;

static struct mv643xx_eth_platform_data eth1_pd = {

	.port_number	= 1,

};



static struct platform_device eth1_device = {

	.name		= MV643XX_ETH_NAME,
@@ -385,7 +389,9 @@ static struct resource mv64x60_eth2_resources[] = { 
	},

};



static struct mv643xx_eth_platform_data eth2_pd;

static struct mv643xx_eth_platform_data eth2_pd = {

	.port_number	= 2,

};



static struct platform_device eth2_device = {

	.name		= MV643XX_ETH_NAME,

CRA Git | Maintained and supported by SUSTech CRA and CCSE