linux.git/drivers/net/e1000, branch v2.6.25

e1000: warn if this driver is used for e1000e devices

2008-02-11T19:51:40+00:00

We're already starting to see reports from users still
using e1000 where they should be using e1000e now that this is
actually possible. Just to prevent some of this thrash, add
a big warning on load on these devices that people should
switch to e1000e.

Signed-off-by: Auke Kok 
Acked-by: Jesse Brandeburg 
Signed-off-by: Jeff Garzik

replace code with FIELD_SIZEOF

2008-02-11T19:51:40+00:00

Signed-off-by: Julia Lawall 
Signed-off-by: Auke Kok 
Signed-off-by: Jeff Garzik

e1000: Fix for 32 bits platforms with 64 bits resources

2008-02-11T15:32:16+00:00

The e1000 driver stores the content of the PCI resources into
unsigned long's before ioremapping. This breaks on 32 bits
platforms that support 64 bits MMIO resources such as ppc 44x.

This fixes it by removing those temporary variables and passing
directly the result of pci_resource_start/len to ioremap.

The side effect is that I removed the assignments to the netdev
fields mem_start, mem_end and base_addr, which are totally useless
for PCI devices.

Signed-off-by: Benjamin Herrenschmidt 
--

 drivers/net/e1000/e1000_main.c |   18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)
Signed-off-by: Jeff Garzik

e1000: make e1000_dump_eeprom() static

2008-02-03T12:28:07+00:00

This patch makes the needlessly global e1000_dump_eeprom() static.

Signed-off-by: Adrian Bunk 
Signed-off-by: Auke Kok 
Signed-off-by: Jeff Garzik 
Signed-off-by: David S. Miller

[net] Gracefully handle shared e1000/1000e driver PCI ID's

2008-01-30T13:30:15+00:00

Both the old e1000 driver and the new e1000e driver can drive some
PCI-Express e1000 cards, and we should avoid ambiguity about which
driver will pick up the support for those cards when both drivers are
enabled.

This solves the problem by having the old driver support those cards if
the new driver isn't configured, but otherwise ceding support for PCI
Express versions of the e1000 chipset to the newer driver.  Thus
allowing both legacy configurations where only the old driver is active
(and handles all chips it knows about) and the new configuration with
the new driver handling the more modern PCIE variants.

Acked-by: Jeff Garzik 
Signed-off-by: Linus Torvalds

Mostly revert "e1000/e1000e: Move PCI-Express device IDs over to e1000e"

2008-01-29T22:54:54+00:00

The new e1000e driver is apparently not yet suitable for general use, so
mark it experimental, and re-instate all the PCI-Express device IDs in
the old and stable e1000 driver so that people (namely me) can continue
to use a driver that actually works.

Auke & co have been appraised of the situation.

Cc: Auke Kok 
Cc: Jeff Garzik 
Cc: David Miller 
Signed-off-by: Linus Torvalds

e1000: Dump the eeprom when a user encounters a bad checksum

2008-01-28T23:07:18+00:00

To help supporting users with a bad eeprom checksum, dump the
eeprom info when such a situation is encountered by a user.

Signed-off-by: Auke Kok 
Signed-off-by: Jeff Garzik

e1000: remove no longer used code for pci read/write cfg

2008-01-28T23:07:17+00:00

Signed-off-by: Adrian Bunk 
Signed-off-by: Auke Kok 
Signed-off-by: Jeff Garzik

e1000 endianness annotations

2008-01-28T23:07:11+00:00

Signed-off-by: Al Viro 
Signed-off-by: Jeff Garzik

[netdrvr] checkpatch cleanups

2008-01-28T23:04:05+00:00

Signed-off-by: Jeff Garzik