linux-toradex.git/drivers/net/netxen, branch v2.6.27.21

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2008-09-03T23:21:02+00:00

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  bnx2x: Accessing un-mapped page
  ath9k: Fix TX control flag use for no ACK and RTS/CTS
  ath9k: Fix TX status reporting
  iwlwifi: fix STATUS_EXIT_PENDING is not set on pci_remove
  iwlwifi: call apm stop on exit
  iwlwifi: fix Tx cmd memory allocation failure handling
  iwlwifi: fix rx_chain computation
  iwlwifi: fix station mimo power save values
  iwlwifi: remove false rxon if rx chain changes
  iwlwifi: fix hidden ssid discovery in passive channels
  iwlwifi: W/A for the TSF correction in IBSS
  netxen: Remove workaround for chipset quirk
  pcnet-cs, axnet_cs: add new IDs, remove dup ID with less info
  ixgbe: initialize interrupt throttle rate
  net/usb/pegasus: avoid hundreds of diagnostics
  tipc: Don't use structure names which easily globally conflict.

netxen: Remove workaround for chipset quirk

2008-09-03T13:26:40+00:00

Remove chipset-specific quirk workaround; the workaround caused
unrecoverable DMA lockups when the driver was loaded following a
PXE boot.

Signed-off-by: Dhananjay Phadke 
Signed-off-by: Michael Brown 
Signed-off-by: Jeff Garzik

removed unused #include 's

2008-08-23T19:14:12+00:00

This patch lets the files using linux/version.h match the files that
#include it.

Signed-off-by: Adrian Bunk 
Signed-off-by: Linus Torvalds

netxen: update driver version

2008-08-14T08:43:32+00:00

Raise driver version to 4.0.11.

Signed-off-by: Dhananjay Phadke 
Signed-off-by: Jeff Garzik

netxen: cleanup interrupt code

2008-08-14T08:43:16+00:00

Mark interrupt scheme in very old firmware incompatible. Interrupt mask
and status registers are per pci function / port.

Signed-off-by: Dhananjay Phadke 
Signed-off-by: Jeff Garzik

netxen: fix dma watchdog

2008-08-14T08:43:14+00:00

NX3031 does not require driver to kill dma watchdog.

Signed-off-by: Dhananjay Phadke 
Signed-off-by: Jeff Garzik

netxen: force link update across ifdown/ifup

2008-08-14T08:43:12+00:00

Re-read link status in dev open(). Schedule link watchdog only
if dev is up.

Signed-off-by: Dhananjay Phadke 
Signed-off-by: Jeff Garzik

netxen: fix rxbuf leak across driver reload

2008-08-14T08:43:08+00:00

Free up rx ring during driver unload or open() failure.

Signed-off-by: Dhananjay Phadke 
Signed-off-by: Jeff Garzik

netxen: fix mac addr setup

2008-08-14T08:43:05+00:00

For NX3031 mac addr should be read from firmware. mac addr in flash
is still valid, but can be overridden by firmware if running in
virtualization environment.

For old revisions, mac addr is retrieved directly from flash.

Signed-off-by: Dhananjay Phadke 
Signed-off-by: Jeff Garzik

drivers/net/netxen/netxen_nic_hw.c: fix printk warnings

2008-08-07T06:21:17+00:00

drivers/net/netxen/netxen_nic_hw.c: In function 'netxen_nic_pci_mem_read_direct':
drivers/net/netxen/netxen_nic_hw.c:1414: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type 'u64'
drivers/net/netxen/netxen_nic_hw.c: In function 'netxen_nic_pci_mem_write_direct':
drivers/net/netxen/netxen_nic_hw.c:1487: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type 'u64'

You don't know what type was used for u64 hence they cannot be printed without
casting.

Signed-off-by: Andrew Morton 
Signed-off-by: Jeff Garzik