into home.osdl.org:/home/torvalds/v2.5/linux

into home.osdl.org:/home/torvalds/v2.5/linux

The enclosed patch ports the ne3210 driver over the EISA probing API.

It also fixes some ioremap/isa_memcopy_fromio problems (depending on
where the card memory was mapped) by using ioremap unconditionally and
letting memcopy_fromio do the right thing.

Finally, it removes the card from Space.c (warning, potential
interface renumbering !).

The module options are currently disabled, until Rusty's
module_param_array() patch is included. I will re-introduce them ASAP.

Quite heavily tested on x86.

Sorry, overlooked the corresponding .h file in that patch, here it is.

This patch applies to 2.5.68 and is listed on kbugs.org. The debug statement
is never executed because it is after a return.

Affects: JFS, scsi/{sym,sym2}, arch/ia64/sn/io/sn2/{module,pic}.c

* block/cciss: eliminate "comparison always false" warning
* char/agp/amd64-agp: properly suffix 64-bit constants
* ide/legacy/pdc4030: fix incomplete conversion to new IDE module API

'probe' module parameter is only used when arlan is built as a module.

As the functions and definitions in linux/mca-legacy.h are deprecated,
require that users explicitly include linux/mca-legacy.h as needed.

Prior to this change, _all_ users of linux/mca.h (i.e. proper users)
issued a warning at compile time, when the MCA legacy API was enabled.
Now only actual users of the legacy API cause warnings, not all MCA drivers.

wants 'phases'

Cset exclude: geert@linux-m68k.org|ChangeSet|20030912135245|42657

into home.osdl.org:/home/torvalds/v2.5/linux

into redhat.com:/spare/repo/misc-2.5

into home.osdl.org:/home/torvalds/v2.5/linux

The patch below switches MII to be select'ed instead of including it in
the Makefile.

Note that this patch requires a recent Linus' tree with the select CRC32
patch included.

diffstat output:

 drivers/net/Kconfig          |   11 +++++++++++
 drivers/net/Makefile         |   28 +++++++++++-----------------
 drivers/net/pcmcia/Kconfig   |    1 +
 drivers/net/tulip/Kconfig    |    1 +
 drivers/usb/net/Kconfig      |    2 ++
 drivers/usb/net/Makefile.mii |    6 ------
 6 files changed, 26 insertions(+), 23 deletions(-)


Tangential to the patch I observed a small problem (not fixed in the patch):
MII depends on NET_ETHERNET, but USB_PEGASUS and USB_USBNET depend
only on NET.

cu
Adrian

Similar to the patch Brian Gerst sent for CRC32, this patch changes
ZLIB_{IN,DE}FLATE to be select'ed.

The dependencies are much better maintainable that way.

Existing code for drivers/net/wan/z8530 is riddled with self-deadlocks
and irq flag confusion.  For example:
	z8530_init -> do_z8530_init -> write_zsreg
self deadlocks on the channel lock.

Several places acquire both the channel and dma lock and then
reuse the same irq flags variable - ouch.

This code at least, correctly probes (for no device case) on SMP.
Other paths verified by inspection.

The sealevel driver called sppp_attach before checking that board existed
and never called detach in the error path.

My change is to call sppp_attach from the netdev->init hook which happens
later in the process, and call detach from the uninit hook.

Also, changed the structure element 'netdev' to 'pppdev' to avoid confusion.

Here is the fix against 2.6.0-test5 latest

For e1000 and baycom_epp.

Contributed by Jeff Garzik.

Hi,
Please apply to 2.6.0-test5-current.

Thanks,
--
~Randy


From: Randy Hron <rwhron@earthlink.net>


Remove unneeded include of version.h.
Test compiled against 2.6.0-test5-bk9.


 linux-260-t5bk12-kj-rddunlap/drivers/net/e100/e100.h |    1 -
 1 files changed, 1 deletion(-)

Hi,
Please apply to 2.6.0-test5-current.

Thanks,
--
~Randy


From: Domen Puncer <domen@coderock.org>

IMO, that verify_area wasn't needed.



 linux-260-t5bk12-kj-rddunlap/drivers/net/wireless/orinoco.c |    4 ----
 1 files changed, 4 deletions(-)

* Some archs don't like calling pci_alloc_consistent before calling
pci_enable_device.  (Imagine that).  This corrects that.

* Driver was advertising HW_CSUM, but hardware is only capable of IP_CSUM.

* PRO/10+ (10 Mbps-only card) was not configured properly so it didn't
pass traffic.

* removed unused var, ASSERT macro
* missed a free_netdev() in probe cleanup undo.

* Better propagation of error codes during probe/open paths.
  {Janice Girouard (janiceg@us.ibm.com)]

* Bug fix: SERDES devices might be connected to back-plan switch that
  doesn't support auto-neg, so add the capability to force 1000/full.

* handle ethtool force flow control
* correctly set flow control hi/low watermarks based on size of Rx FIFO
  area.  The size can change if doing Jumbo Frames or, in the case of
  82547, is smaller to start with.
* was not properly forcing flow control settings to fc_none if using
  strict IEEE flow control override.

Replace proc_read with seq_file interface which is much cleaner.

Also, instead of searching the list of devices looking for the
name which is slow and would break if interface name changes;
store a pointer to device in the proc entry, and retrieve
it from the information saved by single_open.

Formatting and other behaviours are retained.

Existing code does not
	- check if proc_fs functions return error.
	- use proc_mkdir to make the directory.

Note pSkRootDir defined twice.