[BK PATCHES] net driver merges

[BK PATCHES] net driver merges

[Jeff Garzik]

Linus, please do a

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

Others may obtain the patch from

ftp://ftp.kernel.org/pub/linux/kernel/people/jgarzik/patchkits/2.5/2.5.70-bk10-netdrvr1.patch.bz2

This will update the following files:

 MAINTAINERS                      |    7 
 drivers/net/8139cp.c             |    2 
 drivers/net/Makefile             |    2 
 drivers/net/arcnet/arc-rawmode.c |   10 
 drivers/net/arcnet/arcnet.c      |   10 
 drivers/net/arcnet/rfc1051.c     |   10 
 drivers/net/arcnet/rfc1201.c     |   12 
 drivers/net/dl2k.h               |    1 
 drivers/net/ns83820.c            |    2 
 drivers/net/pcmcia/fmvj18x_cs.c  |   12 
 drivers/net/sb1000.c             |   22 
 drivers/net/sk98lin/skge.c       |    2 
 drivers/net/tg3.c                |    2 
 drivers/net/wireless/Kconfig     |   15 
 drivers/net/wireless/Makefile    |    1 
 drivers/net/wireless/atmel.c     | 3943 +++++++++++++++++++++++++++++++++++++++
 drivers/net/wireless/atmel_cs.c  |  768 +++++++
 include/linux/ethtool.h          |   27 
 18 files changed, 4791 insertions(+), 57 deletions(-)

through these ChangeSets:

<yoshfuji@linux-ipv6.org> (03/06/06 1.1313)
   [netdrvr] C99 initializers for arcnet

<scott.feldman@intel.com> (03/06/06 1.1312)
   [PATCH] remove ethtool privileged references
   
   dev_ioctl already checks capable(CAP_NET_ADMIN) for SOICETHTOOL, so
   privileged reference are not necessary.

<scott.feldman@intel.com> (03/06/06 1.1311)
   [PATCH] 10GbE ethtool support
   
   Add 10GbE support for ethtool.

<zwane@linuxpower.ca> (03/06/06 1.1310)
   [PATCH] cli/sti cleanup for fmvj18x
   
   This one should be safe as we're protected by the xmit_lock in all instances

<jgarzik@redhat.com> (03/06/06 1.1309)
   [netdrvr] add MAINTAINERS entry for atmel wireless driver

<srk@thekelleys.org.uk> (03/06/06 1.1308)
   [netdrvr] add atmel[_cs], new wireless driver
   
   Attached is a driver for Atmel at76c50x WiFi cards. This code started
   out as a GPL release from Atmel of pretty horrible quality and I've
   extensively re-worked it with the aim of making it acceptable in the
   kernel. Please could you take a look and either pass it into the patch
   stream or let me know what's wrong with it?
   
   The code has been tested on at least three different brand cards by
   different people. Jean Tourrilhes took a look at an earlier version an
   was positive. He's put incorporating this into 2.6 as a priority 1.
   The patch works fine on 2.5.70.
   
   The firmware issue has been addressed now. The only firmware in the
   driver is a small stub which reads the MAC address from NVRAM on the
   card. The source for that is included so there are no GPL issues. The
   main firmware is loaded from userspace using Manuel Estrada Sainz's
   sysfs firmware class. I know that the  patch for that has been
   accepted but it hasn't turned up anywhere I can see yet. The 
   driver compiles fine even without the firmware class. I've made a
   package of the firmware images which is available from my website.
   
   The remaining issues with the driver are migrating PCMCIA to the new
   driver model and PCI support. I'm happy to produce followup patches as
   the PCMCIA system gets evolved to the new driver model: the timing on
   that is controlled by others. This set of chips includes a PCI version
   and the driver should support that, but AFAIK there is no PCI hardware
   available anywhere. If Atmel can provide me with some it will be
   simple to add PCI support.
   
   The driver uses the CRC32 library module and the firmware loader. I've
   not put in dependencies on those, but when the lastest set of patches
   go into Kconfig I'll set it up so that selecting the Atmel driver
   selects CRC32 and FW_LOADER too.

<shemminger@osdl.org> (03/06/06 1.1307)
   [PATCH] sb1000 driver bugs
   
   Inspecting the sb1000 driver showed some interesting bugs:
   	- net device pointer is used before the device is allocated; gcc
   	  does catch this.
   	- unregister is called even though device not registered successfully
   	- net device is not freed on remove.
   
   Compiles but don't have hardware to test.  Don't know how it ever worked though.

<reeja.john@amd.com> (03/06/05 1.1306)
   [netdrvr amd8111e] link against mii lib

<jgarzik@redhat.com> (03/06/05 1.1305)
   [netdrvr skge] add ULL modifier to 64-bit constant

<jgarzik@redhat.com> (03/06/05 1.1304)
   [netdrvr] gcc 3.3 cleanups
   
   Mostly adding 'ULL' modifier to 64-bit constants.

[BK PATCHES] net driver merges

[Jeff Garzik]

(note to others -- more coming, the queue isn't empty yet)

Linus, please do a

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

Others may download

ftp://ftp.kernel.org/pub/linux/kernel/people/jgarzik/patchkits/2.5/2.5.74-bk5-netdrvr1.patch.bz2

This will update the following files:

 drivers/net/8139too.c             |    2 
 drivers/net/e1000/e1000.h         |    1 
 drivers/net/e1000/e1000_ethtool.c |    5 -
 drivers/net/e1000/e1000_hw.c      |   59 ++++++++++--
 drivers/net/e1000/e1000_hw.h      |   18 +++
 drivers/net/e1000/e1000_main.c    |  186 ++++++++++++++++++++------------------
 drivers/net/via-rhine.c           |   36 +++++--
 7 files changed, 198 insertions(+), 109 deletions(-)

through these ChangeSets:

<scott.feldman@intel.com> (03/07/08 1.1431)
   [e1000] misc cleanup
   
   * whitespace cleanup
   * removal of unused members of netdev priv struct
   * extendable arrangement of h/w reset logic

<scott.feldman@intel.com> (03/07/08 1.1430)
   [e1000] s/int/unsigned int/ for descriptor ring indexes
   
   * Perf cleanup: s/int/unsigned int/ for descriptor ring indexes
     [suggestion by Jeff Garzik].
   * Perf cleanup: cache references to ring elements using local pointer

<scott.feldman@intel.com> (03/07/08 1.1429)
   [e1000] h/w workaround for mis-fused parts
   
   * h/w workaround: several 10's of thousands of 82547 controllers where
     mis-fused during manufacturing, resulting in PHY Tx amplitude to be
     too high and out of spec.  This workaround detects those parts, and
     compensates the Tx amplitude by subtracting ~80mV.

<scott.feldman@intel.com> (03/07/08 1.1428)
   [e1000] ethtool diag cleanup
   
   * Cleanup: ethtool diags: only reset if not if_running.

<scott.feldman@intel.com> (03/07/08 1.1427)
   [e1000] alloc_etherdev failure didn't cleanup regions
   
   * Bug fix: alloc_etherdev failure didn't cleanup regions in probe.

<scott.feldman@intel.com> (03/07/08 1.1426)
   [e1000] missing Tx cleanup opportunities during intr handling
   
   * Bug fix: missing Tx cleanup opportunities during interrupt handling.

<scott.feldman@intel.com> (03/07/08 1.1425)
   [e1000] fix VLAN support on PPC64
   
   * Bug fix: fix VLAN support on PPC64 [Mark Rakes (mrakes@vivato.net)]

<scott.feldman@intel.com> (03/07/08 1.1424)
   [e1000] request_irq() failure resulted in freeing twice
   
   * Bug fix: request_irq() failure resulted in freeing resources twice!
     [Don Fry (brazilnut@us.ibm.com)]

<rl@hellgate.ch> (03/07/08 1.1423)
   [PATCH] via-rhine 1.18-2.5: Fix Rhine-I regression
   
   This patch addresses a minor regression reported by Rhine-I users (leading
   to occasional Tx timeouts).
   
   I also merged some cosmetic changes.

<jgarzik@redhat.com> (03/07/05 1.1422)
   [netdrvr 8139too] fix debug printk
   
   printk args had been accidentally reversed

[BK PATCHES] net driver merges

[Jeff Garzik]

Linus, please do a

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

Others may download the patch from

ftp://ftp.kernel.org/pub/linux/kernel/people/jgarzik/patchkits/2.5/2.5.73-bk1-netdrvr1.patch.bz2

This will update the following files:

 drivers/net/sk98lin/skge.c   |  598 +++++++++++++++++++++----------------------
 drivers/net/wan/sdla_chdlc.c |    4 
 drivers/net/wan/sdla_fr.c    |    4 
 drivers/net/wan/sdla_ppp.c   |    4 
 drivers/net/wan/sdla_x25.c   |    4 
 5 files changed, 297 insertions(+), 317 deletions(-)

through these ChangeSets:

<romieu@fr.zoreil.com> (03/06/23 1.1413)
   [netdrvr sk98lin] PCI API conversion, and some cleanups
   
   
   - PCI API init style conversion for drivers/net/sk98lin/skge.c;
   - new helpers: SkGeDev{Init/CleanUp};
   - sk_devs_lock moved around as it's needed early.
   
   Compiles without error. Untested.

<rusty@rustcorp.com.au> (03/06/23 1.1412)
   [PATCH] [PATCH 2.5.72] Use mod_timer in drivers_net_wan_sdla_chdlc.c
   
   From:  Vinay K Nallamothu <vinay-rc@naturesoft.net>

<rusty@rustcorp.com.au> (03/06/23 1.1411)
   [PATCH] [PATCH 2.5.72] Use mod_timer in drivers_net_wan_sdla_x25.c
   
   From:  Vinay K Nallamothu <vinay-rc@naturesoft.net>

<rusty@rustcorp.com.au> (03/06/23 1.1410)
   [PATCH] [PATCH 2.5.72] Use mod_timer in drivers_net_wan_sdla_ppp.c
   
   From:  Vinay K Nallamothu <vinay-rc@naturesoft.net>

<rusty@rustcorp.com.au> (03/06/23 1.1409)
   [PATCH] {PATCH 2.5.72] Use mod_timer in drivers_net_wan_sdla_fr.c
   
   From:  Vinay K Nallamothu <vinay-rc@naturesoft.net>

[BK PATCHES] net driver merges

[Jeff Garzik]

Linus, please do a

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

Others may download the patch from

ftp://ftp.kernel.org/pub/linux/kernel/people/jgarzik/patchkits/2.5/2.5.72-bk2-netdrvr1.patch.bz2

This will update the following files:

 drivers/net/amd8111e.c          |   12 +++--
 drivers/net/bonding/bond_main.c |   88 +++------------------------------------
 drivers/net/ixgb/ixgb_ethtool.c |    1 
 drivers/net/pcmcia/xirc2ps_cs.c |   89 ++++++++++++++++------------------------
 drivers/net/pcnet32.c           |    2 
 drivers/net/sis900.c            |    1 
 drivers/net/tulip/Kconfig       |    2 
 7 files changed, 54 insertions(+), 141 deletions(-)

through these ChangeSets:

<mikpe@csd.uu.se> (03/06/19 1.1366)
   [netdrvr tulip] Kconfig help text fix
   
   While there is a separate driver for 2104x tulips (CONFIG_DE2104X),
   drivers/net/tulip/Kconfig states that CONFIG_TULIP also supports
   2104x tulips. This is not the case since that support was removed
   in December 2001. A user with an old tulip may thus be tricked into
   configuring the wrong driver. (I was, on my PMac 4400.)
   
   The patch below removes this misinformation from tulip's Kconfig.
   

<jgarzik@redhat.com> (03/06/19 1.1365)
   [netdrvr sis900] add new phy id to phy table
   
   (pulled change from 2.4)

<daniel.ritz@gmx.ch> (03/06/19 1.1364)
   [PATCH] xirc2ps_cs update
   
   the second patch:
   replaces busy_loop with a simple macro doing a schedule_timeout. busy_loop was never
   called from interrupt conext anyway, so no need for that. and the sti() is gone.
   
   rgds
   -daniel

<daniel.ritz@gmx.ch> (03/06/19 1.1363)
   [PATCH] xirc2ps_cs update
   
   hi
   
   this patch does:
   - net_device is no longer allocated as part of the driver's private structure,
     instead it's allocated via alloc_netdev
   - xirc2ps_detach calls xirc2ps_release if necessary (like the other drivers)
   
   against 2.5.70-bk.
   
   rgds
   -daniel

<zwane@linuxpower.ca> (03/06/19 1.1362)
   [PATCH] Remove warning due to comparison in drivers/net/pcnet32.c
   
   drivers/net/pcnet32.c: In function `pcnet32_init_ring':
   drivers/net/pcnet32.c:1006: warning: comparison between pointer and integer

<bunk@fs.tum.de> (03/06/19 1.1361)
   [netdrvr ixgb] fix clash with newly-updated ethtool.h

<reeja.john@amd.com> (03/06/19 1.1360)
   [netdrvr amd8111e] fix spinlock recursion / if close failure

<ak@muc.de> (03/06/19 1.1359)
   [PATCH] Remove copied inet_aton code in bond_main.c
   
   According to a report the my_inet_aton code in bond_main.c is copied
   from 4.4BSD, but it doesn't carry a BSD copyright license. In addition
   it is somewhat redundant with the standard in_aton.  Convert it
   to use the linux function.
   
   Error handling is a bit worse than before, but not much.
   
   Patch for 2.5 bonding. The 2.4 version has the same problem, but afaik
   it is scheduled to be replaced by the 2.5 codebase anyways.
   
   -Andi

[BK PATCHES] net driver merges

[Jeff Garzik]

Linus, please do a

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

Others may download the patch from

ftp://ftp.kernel.org/pub/linux/kernel/people/jgarzik/patchkits/2.5/2.5.70-bk3-netdrvr1.patch.bz2

This will update the following files:

 drivers/net/8139too.c        |    6 
 drivers/net/amd8111e.c       | 1047 +++++++++++++++++++++++++++----------------
 drivers/net/amd8111e.h       |  968 ++++++++++++++++++++-------------------
 drivers/net/e100/e100_main.c |   33 -
 drivers/net/pci-skeleton.c   |    4 
 drivers/net/pcnet32.c        |    7 
 drivers/net/r8169.c          |   44 +
 drivers/net/tlan.c           |  116 +++-
 8 files changed, 1306 insertions(+), 919 deletions(-)

through these ChangeSets:

<shemminger@osdl.org> (03/05/29 1.1438)
   [netdrvr e100] initialize callbacks before registering netdev
   
   Ouch.

<reeja.john@amd.com> (03/05/29 1.1437)
   [netdrvr amd8111e] interrupt coalescing, libmii, bug fixes
   
   * Dynamic interrupt coalescing
   * mii lib support
   * dynamic IPG support (disabled by default)
   * jumbo frame fix
   * vlan fix
   * rx irq coalescing fix

<alan@lxorguk.ukuu.org.uk> (03/05/29 1.1436)
   [netdrvr tlan] fix 64-bit issues

<jgarzik@redhat.com> (03/05/29 1.1435)
   [netdrvr r8169] use alloc_etherdev, pci_disable_device

<jgarzik@redhat.com> (03/05/29 1.1433)
   [netdrvr 8139too] respond to "isn't this racy?" comment

<jgarzik@redhat.com> (03/05/28 1.1432)
   [netdrvr] s/init_etherdev/alloc_etherdev/ in code comments,
   in 8139too and pci-skeleton drivers.

<jgarzik@redhat.com> (03/05/28 1.1431)
   [netdrvr tlan] cleanup
   
   * use pci_{request,release}_regions for PCI devices
   * use alloc_etherdev (fixes race)
   * propagate error returns from pci_xxx function errors

<engebret@us.ibm.com> (03/05/27 1.1392.7.7)
   [netdrvr pcnet32] bug fixes
   
   I would like to see a couple of the pcnet32 changes that I think we can
   agree on be put into the trees so a couple of the potential defects can be
   avoided.  The following patch contains just these pieces.  The only
   controversial one is an arbitrary change in the number of iterations in a
   while loop spinning on hardware state.   No matter how this is done, I am
   not especially fond of this bit of code as it has no reasonable error
   recovery path -- however, as a half-way, incremental solution, increasing
   the polling time should help as the 100 value was certainly found to be
   insufficient.  1000 may not be sufficient either, but it is certainly no
   worse.
   
   Both of the other changes were hit in testing (and I belive the wmb() at a
   customer even), so it would help reduce some debug if these go in.  Any
   feedback is appreciated - thanks.