Skip to contentSkip to conversation

2.6.x net driver updates

PATCH New Jeff Garzik 1 participant 1 message Mar 6, 2005

Subsystems (5)
Networking Network drivers Documentation PCI +1 more subsystems
lore
Share & tools
lore

Jeff Garzik

author
#0 lore raw

PATCH 1/1 2.6.x net driver updates

Mostly fixes / MIPS update.

Please do a

bk pull bk://gkernel.bkbits.net/net-drivers-2.6

This will update the following files:

 drivers/net/bagetlance.c             | 1368 -----------------------------------
 Documentation/networking/ixgb.txt    |    9 
 MAINTAINERS                          |    4 
 drivers/net/Kconfig                  |   14 
 drivers/net/Makefile                 |    1 
 drivers/net/Space.c                  |   11 
 drivers/net/amd8111e.c               |    2 
 drivers/net/au1000_eth.c             | 1361 ++++++++++++++++++++++++++++------
 drivers/net/au1000_eth.h             |   55 -
 drivers/net/dl2k.c                   |    2 
 drivers/net/gianfar.c                |    2 
 drivers/net/ibm_emac/ibm_emac.h      |    4 
 drivers/net/ibm_emac/ibm_emac_core.c |   16 
 drivers/net/ibm_emac/ibm_emac_core.h |    2 
 drivers/net/ioc3-eth.c               |   82 +-
 drivers/net/jazzsonic.c              |  217 +++--
 drivers/net/meth.c                   |  275 +++----
 drivers/net/meth.h                   |    2 
 drivers/net/mv643xx_eth.c            |    2 
 drivers/net/pcnet32.c                |   47 -
 drivers/net/s2io.c                   |   45 -
 drivers/net/sb1250-mac.c             |  109 +-
 drivers/net/sgiseeq.c                |   70 +
 drivers/net/sk98lin/skge.c           |    2 
 drivers/net/sonic.c                  |    4 
 drivers/net/wan/Kconfig              |   11 
 drivers/net/wan/hd6457x.c            |    2 
 drivers/net/wan/z85230.c             |    4 
 include/linux/pci_ids.h              |    5 
 29 files changed, 1720 insertions(+), 2008 deletions(-)

through these ChangeSets:

<takis:lumumba.luc.ac.be>:
o Possible AMD8111e free irq issue

Don Fry:
o pcnet32: 79c976 with fiber optic fix

Ganesh Venkatesan:
o ixgb: Documentation/networking/ixgb.txt

John W. Linville:
o sk98lin: add MODULE_DEVICE_TABLE entry

Krzysztof Halasa:
o WAN drivers fix: N2, C101, PCI200SYN - quite fatal

Kumar Gala:
o initialize a spin lock in gianfar driver

Matt Porter:
o emac: fix skb allocation for full-size jumbo frames
o Add PPC440SP support to IBM EMAC driver

Ralf B�chle:
o SGI Seeq updates
o SB1250 driver updates
o S2IO syntax fixes
o Meth driver updates
o Marvell MV-64340 driver upda
o Jazzsonic driver updates
o IOC3 driver updates
o Remove Baget network driver
o Au1000 driver updates

Thierry Vignaud:
o fix driver name in dl2k as returned by ETHTOOL_GDRVINFO

tom watson:
o drivers/net/wan/z85230.c interrupt handling fix

Documentation/networking/ixgb.txt +4 -5
diff -Nru a/Documentation/networking/ixgb.txt b/Documentation/networking/ixgb.txt
@@ -1,7 +1,7 @@
 Linux* Base Driver for the Intel(R) PRO/10GbE Family of Adapters
 ================================================================
 
-September 13, 2004
+November 17, 2004
 
 
 Contents

@@ -18,8 +18,7 @@
 ===============
 
 This file describes the Linux* Base Driver for the Intel(R) PRO/10GbE Family 
-of Adapters, version 1.0.x.  This driver includes support for Itanium(TM)2 and
-EM64T systems.
+of Adapters, version 1.0.x.  
 
 For questions related to hardware requirements, refer to the documentation 
 supplied with your Intel PRO/10GbE adapter. All hardware requirements listed 

@@ -71,8 +70,8 @@
     Ethernet PAUSE frames.
 
 RxDescriptors
-Valid Range: 64-4096
-Default Value: 1024
+Valid Range: 64-512
+Default Value: 512
     This value is the number of receive descriptors allocated by the driver. 
     Increasing this value allows the driver to buffer more incoming packets. 
     Each descriptor is 16 bytes.  A receive buffer is also allocated for
MAINTAINERS +2 -2
diff -Nru a/MAINTAINERS b/MAINTAINERS
@@ -910,10 +910,10 @@
 W:	http://www.icp-vortex.com/
 S:	Supported
 
-GENERIC HDLC DRIVER, N2 AND C101 DRIVERS
+GENERIC HDLC DRIVER, N2, C101, PCI200SYN and WANXL DRIVERS
 P:	Krzysztof Halasa
 M:	[email protected]
-W:	http://hq.pm.waw.pl/hdlc/
+W:	http://www.kernel.org/pub/linux/utils/net/hdlc/
 S:	Maintained
 
 HAYES ESP SERIAL DRIVER
drivers/net/Kconfig +3 -11
diff -Nru a/drivers/net/Kconfig b/drivers/net/Kconfig
@@ -445,7 +445,7 @@
 
 config MIPS_JAZZ_SONIC
 	tristate "MIPS JAZZ onboard SONIC Ethernet support"
-	depends on NET_ETHERNET && MIPS_JAZZ
+	depends on NET_ETHERNET && MACH_JAZZ
 	help
 	  This is the driver for the onboard card of MIPS Magnum 4000,
 	  Acer PICA, Olivetti M700-10 and a few other identical OEM systems.

@@ -470,7 +470,7 @@
 
 config SGI_IOC3_ETH
 	bool "SGI IOC3 Ethernet"
-	depends on NET_ETHERNET && SGI_IP27
+	depends on NET_ETHERNET && PCI && SGI_IP27
 	select CRC32
 	select MII
 	help

@@ -1763,14 +1763,6 @@
 	  DEC (now Compaq) based on the AMD Lance chipset, including the
 	  DEPCA series.  (This chipset is better known via the NE2100 cards.)
 
-config BAGETLANCE
-	tristate "Baget AMD LANCE support"
-	depends on NET_ETHERNET && BAGET_MIPS
-	help
-	  Say Y to enable kernel support for AMD Lance Ethernet cards on the
-	  MIPS-32-based Baget embedded system.  This chipset is better known
-	  via the NE2100 cards.
-
 config 68360_ENET
 	bool "Motorola 68360 ethernet controller"
 	depends on M68360

@@ -2077,7 +2069,7 @@
 
 config MV643XX_ETH
 	tristate "MV-643XX Ethernet support"
-	depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX
+	depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MOMENCO_OCELOT_3
 	help
 	  This driver supports the gigabit Ethernet on the Marvell MV643XX
 	  chipset which is used in the Momenco Ocelot C and Jaguar ATX.
drivers/net/Makefile +0 -1
diff -Nru a/drivers/net/Makefile b/drivers/net/Makefile
@@ -162,7 +162,6 @@
 obj-$(CONFIG_MIPS_GT96100ETH) += gt96100eth.o
 obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
 obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o
-obj-$(CONFIG_BAGETLANCE) += bagetlance.o
 obj-$(CONFIG_DECLANCE) += declance.o
 obj-$(CONFIG_ATARILANCE) += atarilance.o
 obj-$(CONFIG_ATARI_BIONET) += atari_bionet.o
drivers/net/Space.c +0 -11
diff -Nru a/drivers/net/Space.c b/drivers/net/Space.c
@@ -302,16 +302,6 @@
 	{NULL, 0},
 };
 
-static struct devprobe2 mips_probes[] __initdata = {
-#ifdef CONFIG_MIPS_JAZZ_SONIC
-	{sonic_probe, 0},
-#endif
-#ifdef CONFIG_BAGETLANCE        /* Lance-based Baget ethernet boards */
-        {bagetlance_probe, 0},
-#endif
-	{NULL, 0},
-};
-
 /*
  * Unified ethernet device probe, segmented per architecture and
  * per bus interface. This drives the legacy devices only for now.

@@ -325,7 +315,6 @@
 		return;
 
 	(void)(	probe_list2(unit, m68k_probes, base_addr == 0) &&
-		probe_list2(unit, mips_probes, base_addr == 0) &&
 		probe_list2(unit, eisa_probes, base_addr == 0) &&
 		probe_list2(unit, mca_probes, base_addr == 0) &&
 		probe_list2(unit, isa_probes, base_addr == 0) &&
drivers/net/amd8111e.c +2 -0
diff -Nru a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
@@ -1381,6 +1381,8 @@
 
 	if(amd8111e_restart(dev)){
 		spin_unlock_irq(&lp->lock);
+		if (dev->irq)
+			free_irq(dev->irq, dev);
 		return -ENOMEM;
 	}
 	/* Start ipg timer */
drivers/net/au1000_eth.c +1114 -247

1,831 lines not on this page · raw message

drivers/net/au1000_eth.h +32 -23

124 lines not on this page · raw message

drivers/net/bagetlance.c deleted +0 -1368

930 lines not on this page · raw message

drivers/net/dl2k.c +1 -1
diff -Nru a/drivers/net/dl2k.c b/drivers/net/dl2k.c

Lines of this file are not shown. View the raw message.

drivers/net/gianfar.c +2 -0
diff -Nru a/drivers/net/gianfar.c b/drivers/net/gianfar.c

Lines of this file are not shown. View the raw message.

drivers/net/ibm_emac/ibm_emac.h +4 -0
diff -Nru a/drivers/net/ibm_emac/ibm_emac.h b/drivers/net/ibm_emac/ibm_emac.h

Lines of this file are not shown. View the raw message.

drivers/net/ibm_emac/ibm_emac_core.c +12 -4
diff -Nru a/drivers/net/ibm_emac/ibm_emac_core.c b/drivers/net/ibm_emac/ibm_emac_core.c

Lines of this file are not shown. View the raw message.

drivers/net/ibm_emac/ibm_emac_core.h +2 -0
diff -Nru a/drivers/net/ibm_emac/ibm_emac_core.h b/drivers/net/ibm_emac/ibm_emac_core.h

Lines of this file are not shown. View the raw message.

drivers/net/ioc3-eth.c +71 -11

82 lines not on this page · raw message

drivers/net/jazzsonic.c +146 -71

217 lines not on this page · raw message

drivers/net/meth.c +143 -132

275 lines not on this page · raw message

drivers/net/meth.h +1 -1
diff -Nru a/drivers/net/meth.h b/drivers/net/meth.h

Lines of this file are not shown. View the raw message.

drivers/net/mv643xx_eth.c +0 -2
diff -Nru a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c

Lines of this file are not shown. View the raw message.

drivers/net/pcnet32.c +29 -18

47 lines not on this page · raw message

drivers/net/s2io.c +23 -22

45 lines not on this page · raw message

drivers/net/sb1250-mac.c +58 -51

109 lines not on this page · raw message

drivers/net/sgiseeq.c +52 -18

70 lines not on this page · raw message

drivers/net/sk98lin/skge.c +2 -0
diff -Nru a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c

Lines of this file are not shown. View the raw message.

drivers/net/sonic.c +2 -2
diff -Nru a/drivers/net/sonic.c b/drivers/net/sonic.c

Lines of this file are not shown. View the raw message.

drivers/net/wan/Kconfig +6 -5
diff -Nru a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig

Lines of this file are not shown. View the raw message.

drivers/net/wan/hd6457x.c +1 -1
diff -Nru a/drivers/net/wan/hd6457x.c b/drivers/net/wan/hd6457x.c

Lines of this file are not shown. View the raw message.

drivers/net/wan/z85230.c +3 -1
diff -Nru a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c

Lines of this file are not shown. View the raw message.

include/linux/pci_ids.h +5 -0
diff -Nru a/include/linux/pci_ids.h b/include/linux/pci_ids.h

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.