Linus, Mainly this is a merge of 2.4.x stuff from Dave Jones and his patchkit. -- Jeff Garzik | "I went through my candy like hot oatmeal Building 1024 | through an internally-buttered weasel." MandrakeSoft | - goats.com
Pull from: http://gkernel.bkbits.net/net-drivers-2.5 --------------------------------------------------------------------------- ChangeSet@1.307, 2002-02-12 01:56:54-05:00, jgarzik@rum.normnet.org Add new pci id to via-rhine net driver. drivers/net/via-rhine.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) ChangeSet@1.306, 2002-02-12 01:43:07-05:00, jgarzik@rum.normnet.org Cleanup and fixes to sleeping/scheduling in the olympic token ring net driver. Also included are a couple of minor error reporting updates and the proper detection for cardbus removal. Contributor: Mike Phillips Linux Token Ring Project drivers/net/tokenring/olympic.c | 161 ++++++++++++++++++++++++++-------------- drivers/net/tokenring/olympic.h | 1 2 files changed, 109 insertions(+), 53 deletions(-) ChangeSet@1.305, 2002-02-12 01:39:21-05:00, jgarzik@rum.normnet.org A minor patch to remove the last isa_read/isa_write function in the ibmtr token ring net driver. Contributor: Mike Phillips Linux Token Ring Project drivers/net/tokenring/ibmtr.c | 33 +++++++++++++++++++++------------ 1 files changed, 21 insertions(+), 12 deletions(-) ChangeSet@1.304, 2002-02-12 01:36:17-05:00, jgarzik@rum.normnet.org Merge changes from yellowfin GigE net driver version LK1.1.6: * Only print warning on truly "oversized" packets * Fix theoretical bug on gigabit cards - return to 1.1.3 behavior Contributor: Val Henson drivers/net/yellowfin.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) ChangeSet@1.303, 2002-02-12 01:29:52-05:00, jgarzik@rum.normnet.org Merge ethtool support and PPC fix into pcnet32 net driver, from 2.4.x. Also, remove deprecated SIOCDEVPRIVATE ioctl calls. Via Dave Jones. drivers/net/Makefile | 2 drivers/net/pcnet32.c | 194 +++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 168 insertions(+), 28 deletions(-) ChangeSet@1.302, 2002-02-12 01:26:18-05:00, jgarzik@rum.normnet.org Merge ns83820 GigE net driver changes from 2.4.x kernel: 0.13a - optical transceiver support added by Michael Clark <michael@metaparadigm.com> 0.13b - call register_netdev earlier in initialization suppress duplicate link status messages 0.15 get ppc (big endian) working Via Dave Jones. drivers/net/ns83820.c | 285 +++++++++++++++++++++++++++++++++++--------------- 1 files changed, 205 insertions(+), 80 deletions(-) ChangeSet@1.301, 2002-02-12 01:24:27-05:00, jgarzik@rum.normnet.org Merge 8139too net driver oops fix from 2.4.x. Fix originally by Andreas Dilger IIRC, merged by Dave Jones. drivers/net/8139too.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) ChangeSet@1.300, 2002-02-12 01:22:39-05:00, jgarzik@rum.normnet.org Add new ISAPNP card id to 'ne' net driver. Via Dave Jones. drivers/net/ne.c | 3 +++ 1 files changed, 3 insertions(+) ChangeSet@1.299, 2002-02-12 01:21:42-05:00, jgarzik@rum.normnet.org Merge cosmetic cleanup and driver version increment for dmfe net driver from 2.4.x. Via Dave Jones. drivers/net/dmfe.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) ChangeSet@1.298, 2002-02-12 01:19:38-05:00, jgarzik@rum.normnet.org Fix typo in aironet4500 net driver return value, s/NODEV/-ENODEV/, which prevented the driver from building. Via Dave Jones. drivers/net/aironet4500_core.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) ChangeSet@1.297, 2002-02-12 01:14:40-05:00, jgarzik@rum.normnet.org Merge basic ethtool ioctl support from 2.4.x for 3c505 and sis900 net drivers. Merge two sis900 bug fixes from 2.4.x. Via Dave Jones. drivers/net/3c505.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/net/sis900.c | 65 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 139 insertions(+), 7 deletions(-) ChangeSet@1.296, 2002-02-12 01:10:04-05:00, jgarzik@rum.normnet.org Remove deprecated SIOCDEVPRIVATE ioctls in net drivers 3c59x, eepro100, sis900, and tulip. Also, update eepro100 Becker URL. Contributor: Dave Jones drivers/net/3c59x.c | 3 --- drivers/net/eepro100.c | 5 +---- drivers/net/sis900.c | 3 --- drivers/net/tulip/tulip_core.c | 3 --- 4 files changed, 1 insertion(+), 13 deletions(-) ChangeSet@1.295, 2002-02-12 01:04:17-05:00, jgarzik@rum.normnet.org request_region cleanups from 2.4 and the kernel janitors. Via Dave Jones. drivers/net/arcnet/com90io.c | 5 ++++- drivers/net/eexpress.c | 1 - drivers/net/sb1000.c | 12 ++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) ChangeSet@1.294, 2002-02-12 01:01:22-05:00, jgarzik@rum.normnet.org Various minor documentation / comment typo fixes for net drivers 3c509, acenic, ni52, and skfp. Via Dave Jones. drivers/net/3c509.c | 2 +- drivers/net/acenic.c | 2 +- drivers/net/ni52.c | 2 +- drivers/net/skfp/h/cmtdef.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------------
