Commit 2370965c 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: (51 commits)
  sk98lin: mark deprecated in Kconfig
  Hostess SV-11 depends on INET
  Fix link autonegotiation timer.
  sk98lin: planned removal
  B44: increase wait loop
  b44: replace define
  e1000: allow ethtool to see link status when down
  e1000: remove obsolete custom pci_save_state code
  e1000: fix shared interrupt warning message
  atm: Use ARRAY_SIZE macro when appropriate
  bugfixes and new hardware support for arcnet driver
  pcnet32 NAPI no longer experimental
  MAINTAINER
  macb: Remove inappropriate spinlocks around mii calls
  Convert meth to netdev_priv
  sky2: v1.13
  sky2: receive error handling improvements
  sky2: transmit timeout
  sky2: flow control negotiation for Yukon-FE
  sky2: no need to reset pause bits on shutdown
  ...
parents 59b8175c 0b3581e2

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -2630,8 +2630,8 @@ T: git kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git 
S:	Maintained



PCNET32 NETWORK DRIVER

P:	Thomas Bogendrfer

M:	tsbogend@alpha.franken.de

P:	Don Fry

M:	pcnet32@verizon.net

L:	netdev@vger.kernel.org

S:	Maintained

drivers/atm/he.c

+1 −1
Original line number Diff line number Diff line
@@ -3017,7 +3017,7 @@ read_prom_byte(struct he_dev *he_dev, int addr) 
	he_writel(he_dev, val, HOST_CNTL);

       

	/* Send READ instruction */

	for (i = 0; i < sizeof(readtab)/sizeof(readtab[0]); i++) {

	for (i = 0; i < ARRAY_SIZE(readtab); i++) {

		he_writel(he_dev, val | readtab[i], HOST_CNTL);

		udelay(EEPROM_DELAY);

	}

drivers/atm/idt77252.c

+4 −4
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ idt77252_eeprom_read_status(struct idt77252_dev *card) 


	gp = idt77252_read_gp(card) & ~(SAR_GP_EESCLK|SAR_GP_EECS|SAR_GP_EEDO);



	for (i = 0; i < sizeof(rdsrtab)/sizeof(rdsrtab[0]); i++) {

	for (i = 0; i < ARRAY_SIZE(rdsrtab); i++) {

		idt77252_write_gp(card, gp | rdsrtab[i]);

		udelay(5);

	}
@@ -422,7 +422,7 @@ idt77252_eeprom_read_byte(struct idt77252_dev *card, u8 offset) 


	gp = idt77252_read_gp(card) & ~(SAR_GP_EESCLK|SAR_GP_EECS|SAR_GP_EEDO);



	for (i = 0; i < sizeof(rdtab)/sizeof(rdtab[0]); i++) {

	for (i = 0; i < ARRAY_SIZE(rdtab); i++) {

		idt77252_write_gp(card, gp | rdtab[i]);

		udelay(5);

	}
@@ -469,14 +469,14 @@ idt77252_eeprom_write_byte(struct idt77252_dev *card, u8 offset, u8 data) 


	gp = idt77252_read_gp(card) & ~(SAR_GP_EESCLK|SAR_GP_EECS|SAR_GP_EEDO);



	for (i = 0; i < sizeof(wrentab)/sizeof(wrentab[0]); i++) {

	for (i = 0; i < ARRAY_SIZE(wrentab); i++) {

		idt77252_write_gp(card, gp | wrentab[i]);

		udelay(5);

	}

	idt77252_write_gp(card, gp | SAR_GP_EECS);

	udelay(5);



	for (i = 0; i < sizeof(wrtab)/sizeof(wrtab[0]); i++) {

	for (i = 0; i < ARRAY_SIZE(wrtab); i++) {

		idt77252_write_gp(card, gp | wrtab[i]);

		udelay(5);

	}

drivers/atm/nicstarmac.c

+3 −1
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
 * Read this ForeRunner's MAC address from eprom/eeprom

 */



#include <linux/kernel.h>



typedef void __iomem *virt_addr_t;



#define CYCLE_DELAY 5
@@ -176,7 +178,7 @@ read_eprom_byte(virt_addr_t base, u_int8_t offset) 
   val = NICSTAR_REG_READ( base, NICSTAR_REG_GENERAL_PURPOSE ) & 0xFFFFFFF0;



   /* Send READ instruction */

   for (i=0; i<sizeof readtab/sizeof readtab[0]; i++)

   for (i=0; i<ARRAY_SIZE(readtab); i++)

   {

	NICSTAR_REG_WRITE( base, NICSTAR_REG_GENERAL_PURPOSE,

		(val | readtab[i]) );

drivers/net/Kconfig

+8 −6
Original line number Diff line number Diff line
@@ -1284,8 +1284,8 @@ config PCNET32 
	  will be called pcnet32.



config PCNET32_NAPI

	bool "Use RX polling (NAPI) (EXPERIMENTAL)"

	depends on PCNET32 && EXPERIMENTAL

	bool "Use RX polling (NAPI)"

	depends on PCNET32

	help

	  NAPI is a new driver API designed to reduce CPU and interrupt load

	  when the driver is receiving lots of packets from the card. It is
@@ -2125,14 +2125,16 @@ config SKY2 
	  will be called sky2.  This is recommended.



config SK98LIN

	tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support"

	tristate "Marvell Yukon Chipset / SysKonnect SK-98xx Support (DEPRECATED)"

	depends on PCI

	---help---

	  Say Y here if you have a Marvell Yukon or SysKonnect SK-98xx/SK-95xx

	  compliant Gigabit Ethernet Adapter.



	  This driver supports the original Yukon chipset. A cleaner driver is 

	  also available (skge) which seems to work better than this one.

	  This driver supports the original Yukon chipset. This driver is

	  deprecated and will be removed from the kernel in the near future,

	  it has been replaced by the skge driver. skge is cleaner and

	  seems to work better.



	  This driver does not support the newer Yukon2 chipset. A separate

	  driver, sky2, is provided to support Yukon2-based adapters.
@@ -2337,7 +2339,7 @@ config QLA3XXX 


config ATL1

	tristate "Attansic L1 Gigabit Ethernet support (EXPERIMENTAL)"

	depends on NET_PCI && PCI && EXPERIMENTAL

	depends on PCI && EXPERIMENTAL

	select CRC32

	select MII

	help

CRA Git | Maintained and supported by SUSTech CRA and CCSE