LWN.net Logo

2.6.x net driver merges

From:  Jeff Garzik <jgarzik@pobox.com>
To:  torvalds@osdl.org
Subject:  [BK PATCHES] 2.6.x net driver merges
Date:  Fri, 1 Aug 2003 15:44:20 -0400
Cc:  linux-kernel@vger.kernel.org, netdev@oss.sgi.com


Linus, please do a

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

Others may download the patch from

ftp://ftp.??.kernel.org/pub/linux/kernel/people/jgarzik/patchkits/2.6/2.6.0-test2-netdrvr1.patch.bz2

This will update the following files:

 Documentation/networking/bonding.txt |  343 ++++++++++++++++++++++++-----------
 Documentation/networking/ifenslave.c |    3 
 drivers/net/arcnet/com20020-isa.c    |    2 
 drivers/net/tokenring/ibmtr.c        |    3 
 drivers/net/wireless/airo.c          |  104 +++++++---
 5 files changed, 309 insertions(+), 146 deletions(-)

through these ChangeSets:

<jgarzik@redhat.com> (03/08/01 1.1547.8.10)
   Cset exclude: jgarzik@redhat.com|ChangeSet|20030731201437|53548
   
   My fix was wrong, and, mainline now has a better fix.

<jgarzik@redhat.com> (03/07/31 1.1547.8.9)
   [tokenring ibmtr_cs] fix build, due to missing ibmtr.c build
   
   Note: Better fix is needed.
   
   Contributed by Mike Phillips.

<jgarzik@redhat.com> (03/07/31 1.1547.8.8)
   [arcnet com20020-isa] fix build broken by lack of ->owner

<jgarzik@redhat.com> (03/07/31 1.1547.8.7)
   [netdrvr bonding] fix ifenslave build on ia64
   
   Forward port from 2.4.

<jgarzik@redhat.com> (03/07/31 1.1547.8.6)
   [netdrvr bonding] update docs

<achirica@telefonica.net> (03/07/29 1.1547.8.5)
   [wireless airo] adds support for noise level reporting (if available)

<achirica@telefonica.net> (03/07/29 1.1547.8.4)
   [wireless airo] makes the card passive when entering monitor mode

<achirica@telefonica.net> (03/07/29 1.1547.8.3)
   [wireless airo] eliminate infinite loop
   
   makes sure a possible (never happened, but just in case) infinite
   loop in the transmission code terminates.

<achirica@telefonica.net> (03/07/29 1.1547.8.2)
   [wireless airo] safer shutdown sequence
   
   changes the card shutdown sequence to a safer one

<achirica@telefonica.net> (03/07/29 1.1547.8.1)
   [wireless airo] fix Tx race

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Copyright © 2003, Eklektix, Inc.
Comments and public postings are copyrighted by their creators.
Linux is a registered trademark of Linus Torvalds