Linus, please do a bk pull http://gkernel.bkbits.net/net-drivers-2.5 This will update the following files: drivers/net/acenic.c | 280 +++++++++++++++++++++++++++++-------- drivers/net/acenic.h | 41 ++++- drivers/net/at1700.c | 1 drivers/net/e100/e100.h | 41 ++--- drivers/net/e100/e100_config.c | 13 - drivers/net/e100/e100_config.h | 13 - drivers/net/e100/e100_eeprom.c | 38 ++--- drivers/net/e100/e100_main.c | 125 +++++++--------- drivers/net/e100/e100_phy.c | 56 +++---- drivers/net/e100/e100_phy.h | 13 - drivers/net/e100/e100_proc.c | 18 +- drivers/net/e100/e100_ucode.h | 13 - drivers/net/e100/e100_vendor.h | 13 - drivers/net/e1000/e1000_main.c | 2 drivers/net/eepro100.c | 1 drivers/net/hp100.c | 59 ++++++- drivers/net/lance.c | 2 drivers/net/ns83820.c | 303 ++++++++++++++++++++++++----------------- drivers/net/pcnet32.c | 24 ++- 19 files changed, 652 insertions(+), 404 deletions(-) through these ChangeSets: <jgarzik@mandrakesoft.com> (02/03/15 1.487) Fix e1000 net driver build with newer binutils. <jgarzik@mandrakesoft.com> (02/03/15 1.486) Don't include linux/delay.h twice in eepro100 net driver. Noticed by Alan Cox. <jt@bougret.hpl.hp.com> (02/03/15 1.485) Convert hp100 net driver to PCI DMA mapping API. (fixes build) <p_gortmaker@yahoo.com> (02/03/15 1.484) lance net driver update: mark lance_probe as __init <jgarzik@mandrakesoft.com> (02/03/15 1.483) acenic gige net driver update: merge VLAN support from 2.4.x kernel <jes@wildopensource.com> (02/03/15 1.482) acenic gige net driver fixes: * fix Tigon I support * fix memory leak <jes@wildopensource.com> (02/03/15 1.481) acenic gige net driver updates: * various small cleanups * ETHTOOL_GDRVINFO support <eli.kupermann@intel.com> (02/03/15 1.479) e100 net driver update 4/4: - switch to yield function as suggested by you, Arjan and Andrew. - fixed broken logic in the use of time_before/time_after - possible bug cause in previous design - in most of the places we were going to sleep and than check if time expires before checking if condition is satisfied. If, for example, we needed to wait up to 3 jiffies we could do schedule_timeout(1) and get up after 4 ticks check that time expired and go away crying about failure without checking that condition is OK.(in fact I saw it happen on one SMP platform here). <eli.kupermann@intel.com> (02/03/15 1.478) e100 net driver update 3/4: - added pci flushing in the e100_set_intr_mask function (pci posting bug) - better logic in the prepare_xmit_buff function moving some tx buffer initialization code to the start of the function. <eli.kupermann@intel.com> (02/03/15 1.477) e100 net driver update 2/4: - remove dummy defines and also ia64 specific [Arjan's notes [:-)] ] - fixed problem in e100_check_options function reported by our Q/A <eli.kupermann@intel.com> (02/03/15 1.476) e100 net driver update 1/4: - minor changes to the license from our technical writer [still GPL ;-)] <bcrl@redhat.com> (02/03/15 1.475) Updates to ns83820 gige net driver: * Use likely() and unlikely() for better branch prediction * Various small cleanups * Much improved interrupt mitigation * Much improved throughput <sawa@yamamoto.gr.jp> (02/03/15 1.474) Fix bug in at1700 net driver: RX_MODE was not set for the multicast case. Set it. Fixes multicast. <anton@samba.org> (02/03/11 1.384.3.6) pcnet32 net driver updates 6/6: perform dwio reset after checking wio, otherwise some cards fail the probe, fix from Paul Mackerras <anton@samba.org> (02/03/11 1.384.3.5) pcnet32 net driver updates 5/6: pcnet32_purge_tx_ring can be called from interrupt, so must use dev_kfree_skb_any, fix from Dave Engebretsen. <anton@samba.org> (02/03/11 1.384.3.4) pcnet32 net driver updates 4/6: Increase device watchdog timeout, fix from Dave Engebretsen. <anton@samba.org> (02/03/11 1.384.3.3) pcnet32 net driver updates 3/6: protect pcnet32_tx_timeout and pcnet32_set_multicast_list with spinlock, fix from Dave Engebretsen <anton@samba.org> (02/03/11 1.384.3.2) pcnet32 net driver updates 2/6: irq could overflow unsigned char, change to unsigned int ioaddr could overflow unsigned int, change to unsigned long <anton@samba.org> (02/03/11 1.384.3.1) pcnet32 net driver updates 1/6: fix leak in pci memory space on machines with IOMMUs.
