Linus, please do a
bk pull bk://kernel.bkbits.net/jgarzik/net-drivers-2.6
Patch is also available at
ftp://ftp.kernel.org/pub/linux/kernel/people/jgarzik/patchkits/2.6/2.6.0-test3-bk5-netdrvr1.patch.bz2
This will update the following files:
drivers/net/Kconfig | 11
drivers/net/Makefile | 1
drivers/net/Makefile.lib | 1
drivers/net/arcnet/com20020-pci.c | 6
drivers/net/arcnet/com20020.c | 31
drivers/net/arcnet/com90io.c | 17
drivers/net/hydra.c | 24
drivers/net/sis190.c | 2094 +++++++++++++++++++++++++++++---------
drivers/net/tokenring/3c359.c | 2
drivers/net/tokenring/olympic.c | 3
drivers/net/tulip/tulip_core.c | 1
drivers/net/wan/z85230.c | 6
drivers/net/wireless/airo.c | 12
drivers/net/wireless/atmel_cs.c | 1
14 files changed, 1715 insertions(+), 495 deletions(-)
through these ChangeSets:
<[email protected]> (03/08/17 1.1217)
[netdrvr sis190] allocate RX/TX descriptors using PCI DMA API
The RX buffers themselves still need to be converted. The three
places that need fixing are marked with #warning.
<[email protected]> (03/08/17 1.1216)
[netdrvr tulip] add pci id for 3com 3CSOHO100B-TX
<[email protected]> (03/08/17 1.1215)
[netdrvr sis190] manually clean up formatting a bit more
Also, two trivial code changes:
* add unlikely() to assert() definition
* fix MODULE_AUTHOR email address brackets
<[email protected]> (03/08/17 1.1214)
[netdrvr sis190] Lindent sis190. zero code changes.
<[email protected]> (03/08/17 1.1213)
[netdrvr] add sis190 gigabit ethernet driver (note: needs work)
<[email protected]> (03/08/17 1.1212)
[PATCH] Make z8530.c build on 2.6
Either we need to mark this driver (and the parts that use them) as BROKEN,
or at least get it building again.
With this it builds, but of course, I don't have the real hardware.
<[email protected]> (03/08/17 1.1211)
[netdrvr hydra] janitor cleanups
<[email protected]> (03/08/17 1.1210)
[wireless airo] Fix PCI unregister code
<[email protected]> (03/08/17 1.1209)
[wireless airo] Turns on spy code in wireless extensions v16
<[email protected]> (03/08/17 1.1208)
[arcnet com90io] replace check_region with temporary request_region,
in probe phase.
<[email protected]> (03/08/17 1.1207)
[arcnet com20020] misc fixes
* com20020_close expects two arguments (and actually uses the
second argument), but the arcnet layer only passes one arg.
Fun ensues.
* Remove __devinit markers, this is a library module.
* Move request_region up in com20020_found, to make the call
occur before the first I/O access in the function.
<[email protected]> (03/08/17 1.1206)
[arcnet com20020] check_region removal, ->name removal breakage fix
<[email protected]> (03/08/17 1.1205)
[netdrvr] clean up driver object name removal breakage
Affected drivers: atmel_cs, olympic, 3c359
Jeff Garzik <[email protected]> :
[net-drivers-2.6 update]
> drivers/net/sis190.c | 2094 +++++++++++++++++++++++++++++---------
synchronize_irq() requires an argument when built with CONFIG_SMP.
drivers/net/sis190.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/net/sis190.c~synchronize_irq-missing-arg-sis190 drivers/net/sis190.c
--- linux-2.6.0-test4/drivers/net/sis190.c~synchronize_irq-missing-arg-sis190 Sat Aug 23 15:37:35 2003
+++ linux-2.6.0-test4-fr/drivers/net/sis190.c Sat Aug 23 15:37:35 2003
@@ -1111,7 +1111,7 @@ SiS190_close(struct net_device *dev)
spin_unlock_irq(&tp->lock);
- synchronize_irq();
+ synchronize_irq(dev->irq);
free_irq(dev->irq, dev);
SiS190_tx_clear(tp);
_
On Sat, Aug 23, 2003 at 03:42:31PM +0200, Francois Romieu wrote:
> Jeff Garzik <[email protected]> :
> [net-drivers-2.6 update]
> > drivers/net/sis190.c | 2094 +++++++++++++++++++++++++++++---------
>
>
> synchronize_irq() requires an argument when built with CONFIG_SMP.
Shouldn't it also require it for the UP case? Or is this one of those
subtle things that tells you it's not working on SMP?
Mike Fedyk wrote:
> On Sat, Aug 23, 2003 at 03:42:31PM +0200, Francois Romieu wrote:
>
>>Jeff Garzik <[email protected]> :
>>[net-drivers-2.6 update]
>>
>>> drivers/net/sis190.c | 2094 +++++++++++++++++++++++++++++---------
>>
>>
>>synchronize_irq() requires an argument when built with CONFIG_SMP.
>
>
> Shouldn't it also require it for the UP case? Or is this one of those
> subtle things that tells you it's not working on SMP?
the latter :)
Jeff