[BK PATCHES] net driver merges

Jeff Garzik (jgarzik@pobox.com)
Sat, 29 Mar 2003 00:46:50 -0500


This is a MIME-formatted message. If you see this text it means that your
E-mail software does not support MIME-formatted messages.

--=_courier-11106-1048918239-0001-2
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

nothing terribly interesting

--=_courier-11106-1048918239-0001-2
Content-Type: text/plain; name="net-drivers-2.5.txt"; charset=iso-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="net-drivers-2.5.txt"

Linus, please do a

bk pull bk://kernel.bkbits.net/jgarzik/net-drivers-2.5

This will update the following files:

Documentation/networking/bonding.txt | 142 ++++++--
drivers/net/3c509.c | 2
drivers/net/bonding.c | 581 ++++++++++++++++++++---------------
drivers/net/gt96100eth.c | 17 -
drivers/net/mace.c | 36 +-
drivers/net/r8169.c | 2
drivers/net/tulip/de4x5.c | 1
drivers/net/tulip/dmfe.c | 6
include/linux/if_bonding.h | 9
9 files changed, 491 insertions(+), 305 deletions(-)

through these ChangeSets:

<mbligh@aracnet.com> (03/03/29 1.1029)
[PATCH] remove warning for 3c509.c

Get this compile warning:
drivers/net/3c509.c:207: warning: `el3_device_remove' declared `static' but never defined
because the function definition is under
"#if defined(CONFIG_EISA) || defined(CONFIG_MCA)".

This patch puts the declaration under the same conditions.
I'd be shocked if it wasn't correct ;-)

M.

<paulus@samba.org> (03/03/29 1.1028)
[PATCH] MACE ethernet driver update

This patch updates the MACE ethernet driver, used on older powermacs,
to remove the uses of save_flags/restore_flags/cli/sti and use a
spinlock instead.

Jeff, please send this on to Linus.

Paul.

<davej@codemonkey.org.uk> (03/03/29 1.1027)
[PATCH] finish init_etherdev conversion for gt96100eth

- No need to alloc dev->priv (due to init_etherdev usage)
- No need to kfree dev->priv (kfree'd with (dev) already)

<bunk@fs.tum.de> (03/03/29 1.1026)
[PATCH] fix .text.exit error in drivers/net/r8169.c

In drivers/net/r8169.c the function rtl8169_remove_one is __devexit but
the pointer to it didn't use __devexit_p resulting in a.text.exit
compile error when !CONFIG_HOTPLUG.

The fix is simple:

<fubar@us.ibm.com> (03/03/29 1.1025)
[bonding] bug fixes, and a few minor feature additions

Mainly sync w/ 2.4.x version.

<davej@codemonkey.org.uk> (03/03/29 1.1024)
[tulip dmfe] add pci id

<bwindle@fint.org> (03/03/28 1.1023)
[tulip] remove unnecessary linux/version.h includes

--=_courier-11106-1048918239-0001-2--