linux-toradex.git/drivers/net, branch v2.6.25.12

zd1211rw: add ID for AirTies WUS-201

2008-07-24T16:14:08+00:00

Commit 9dfd55008e3863dcd93219c74bf05b09e5c549e2 upstream

I would like to inform you of our zd1211 based usb wifi adapter (AirTies
WUS-201), which works with the zd1211rw driver with the following device
id definition.

Signed-off-by: Daniel Drake 
Signed-off-by: John W. Linville 
Cc: Peter Nixon 
Signed-off-by: Greg Kroah-Hartman

netdrvr: 3c59x: remove irqs_disabled warning from local_bh_enable

2008-07-24T16:14:05+00:00

commit c5643cab7bf663ae049b11be43de8819683176dd upstream

Original Author: Michael Buesch 

net, vortex: fix lockup

Ingo Molnar reported:

-tip testing found that Johannes Berg's "softirq: remove irqs_disabled
warning from local_bh_enable" enhancement to lockdep triggers a new
warning on an old testbox that uses 3c59x vortex and netlogging:

----->
    calling  vortex_init+0x0/0xb0
    PCI: Found IRQ 10 for device 0000:00:0b.0
    PCI: Sharing IRQ 10 with 0000:00:0a.0
    PCI: Sharing IRQ 10 with 0000:00:0b.1
    3c59x: Donald Becker and others.
    0000:00:0b.0: 3Com PCI 3c556 Laptop Tornado at e0800400.
    PCI: Enabling bus mastering for device 0000:00:0b.0
    initcall vortex_init+0x0/0xb0 returned 0 after 47 msecs
..
    calling  init_netconsole+0x0/0x1b0
    netconsole: local port 4444
    netconsole: local IP 10.0.1.9
    netconsole: interface eth0
    netconsole: remote port 4444
    netconsole: remote IP 10.0.1.16
    netconsole: remote ethernet address 00:19:xx:xx:xx:xx
    netconsole: device eth0 not up yet, forcing it
    eth0:  setting half-duplex.
    eth0:  setting full-duplex.
------------[ cut here ]------------
    WARNING: at kernel/softirq.c:137 local_bh_enable_ip+0xd1/0xe0()
    Pid: 1, comm: swapper Not tainted 2.6.26-rc6-tip #2091
     [] warn_on_slowpath+0x4f/0x70
     [] ? release_console_sem+0x1b4/0x1d0
     [] ? vprintk+0x2a0/0x450
     [] ? __mod_timer+0xa5/0xc0
     [] ? mdio_sync+0x3d/0x50
     [] ? marker_probe_cb+0x46/0xa0
     [] ? printk+0x27/0x50
     [] ? vortex_set_duplex+0x43/0xc0
     [] ? vortex_set_duplex+0xa1/0xc0
     [] ? vortex_timer+0xe2/0x3e0
     [] local_bh_enable_ip+0xd1/0xe0
     [] _spin_unlock_bh+0x2f/0x40
     [] vortex_timer+0xe2/0x3e0
     [] ? trace_hardirqs_on+0xb/0x10
     [] ? trace_hardirqs_on_caller+0x88/0x160
     [] run_timer_softirq+0x162/0x1c0
     [] ? vortex_timer+0x0/0x3e0
     [] local_bh_enable_ip+0xd1/0xe0
     [] _spin_unlock_bh+0x2f/0x40
     [] vortex_timer+0xe2/0x3e0
     [] ? trace_hardirqs_on+0xb/0x10
     [] ? trace_hardirqs_on_caller+0x88/0x160
     [] run_timer_softirq+0x162/0x1c0
     [] ? vortex_timer+0x0/0x3e0
     [] ? vortex_timer+0x0/0x3e0
     [] __do_softirq+0x9a/0x160
     [] ? __do_softirq+0x0/0x160
     [] call_on_stack+0x15/0x30
     [] ? irq_exit+0x55/0x60
     [] ? do_IRQ+0x85/0xd0
     [] ? trace_hardirqs_on_caller+0xc1/0x160
     [] ? common_interrupt+0x28/0x30
     [] ? mutex_unlock+0x8/0x10
     [] ? _cond_resched+0x10/0x30
     [] ? netpoll_setup+0x117/0x390
     [] ? init_netconsole+0x14e/0x1b0
     [] ? ktime_get+0x19/0x40
     [] ? kernel_init+0x1b2/0x2c0
     [] ? init_netconsole+0x0/0x1b0
     [] ? trace_hardirqs_on_thunk+0xc/0x10
     [] ? restore_nocheck_notrace+0x0/0xe
     [] ? kernel_init+0x0/0x2c0
     [] ? kernel_init+0x0/0x2c0
     [] ? kernel_thread_helper+0x7/0x10
     =======================
---[ end trace 37f9c502aff112e0 ]---
    console [netcon0] enabled
    netconsole: network logging started
    initcall init_netconsole+0x0/0x1b0 returned 0 after 2914 msecs

looking at the driver I think the bug is real and the fix actually
is trivial.

vp->lock is also taken in hardware IRQ context, so we _have_ to always
use irqsafe locking. As we run in a timer with IRQs disabled,
we can simply use spin_lock.

Signed-off-by: Ingo Molnar 
Signed-off-by: Jeff Garzik 
Signed-off-by: Greg Kroah-Hartman

b43legacy: Fix possible NULL pointer dereference in DMA code

2008-07-24T16:14:04+00:00

commit 2f9ec47d0954f9d2e5a00209c2689cbc477a8c89 upstream

This fixes a possible NULL pointer dereference in an error path of the
DMA allocation error checking code. This is also necessary for a future
DMA API change that is on its way into the mainline kernel that adds
an additional dev parameter to dma_mapping_error().

Signed-off-by: Michael Buesch 
Signed-off-by: John W. Linville 
Signed-off-by: Greg Kroah-Hartman

b43: Fix possible MMIO access while device is down

2008-07-24T16:14:02+00:00

This fixes a possible MMIO access while the device is still down
from a suspend cycle. MMIO accesses with the device powered down
may cause crashes on certain devices.

Upstream commit is
33598cf261e393f2b3349cb55509e358014bfd1f

Signed-off-by: Michael Buesch 
Signed-off-by: Greg Kroah-Hartman

b43: Do not return TX_BUSY from op_tx

2008-07-24T16:14:02+00:00

Never return TX_BUSY from op_tx. It doesn't make sense to return
TX_BUSY, if we can not transmit the packet.
Drop the packet and return TX_OK.
This will fix the resume hang.

Upstream commit is
66193a7cef2239bfd1b9b96e304770facf7a49c7

Signed-off-by: Michael Buesch 
Signed-off-by: Greg Kroah-Hartman

b43legacy: Do not return TX_BUSY from op_tx

2008-07-24T16:14:01+00:00

Never return TX_BUSY from op_tx. It doesn't make sense to return
TX_BUSY, if we can not transmit the packet.
Drop the packet and return TX_OK.

Upstream commit is
eb803e419ca6be06ece2e42027bb4ebd8ec09f91

Signed-off-by: Michael Buesch 
Signed-off-by: Greg Kroah-Hartman

TTY: fix for tty operations bugs

2008-07-03T03:46:14+00:00

This is fixed with the recent tty operations rewrite in mainline in a
different way, this is a selective backport of the relevant portions to
the -stable tree.

Signed-off-by: Alan Cox 
Signed-off-by: Greg Kroah-Hartman

atl1: relax eeprom mac address error check

2008-06-24T21:08:28+00:00

upstream commit: 58c7821c4264a7ddd6f0c31c5caaf393b3897f10

The atl1 driver tries to determine the MAC address thusly:

	- If an EEPROM exists, read the MAC address from EEPROM and
	  validate it.
	- If an EEPROM doesn't exist, try to read a MAC address from
	  SPI flash.
	- If that fails, try to read a MAC address directly from the
	  MAC Station Address register.
	- If that fails, assign a random MAC address provided by the
	  kernel.

We now have a report of a system fitted with an EEPROM containing all
zeros where we expect the MAC address to be, and we currently handle
this as an error condition.  Turns out, on this system the BIOS writes
a valid MAC address to the NIC's MAC Station Address register, but we
never try to read it because we return an error when we find the all-
zeros address in EEPROM.

This patch relaxes the error check and continues looking for a MAC
address even if it finds an illegal one in EEPROM.

http://ubuntuforums.org/showthread.php?t=562617

[jacliburn@bellsouth.net: backport to 2.6.25.7]

Signed-off-by: Radu Cristescu 
Signed-off-by: Jay Cliburn 
Signed-off-by: Jeff Garzik 
Signed-off-by: Greg Kroah-Hartman

b43: Fix possible NULL pointer dereference in DMA code

2008-06-22T05:24:55+00:00

a cut-down version of commit 028118a5f09a9c807e6b43e2231efdff9f224c74 upstream

This fixes a possible NULL pointer dereference in an error path of the
DMA allocation error checking code. In case the DMA allocation address is invalid,
the dev pointer is dereferenced for unmapping of the buffer.

Reported-by: Miles Lane 
Signed-off-by: Michael Buesch 
Signed-off-by: John W. Linville 
Signed-off-by: Greg Kroah-Hartman

b43: Fix noise calculation WARN_ON

2008-06-22T05:24:55+00:00

commit 98a3b2fe435ae76170936c14f5c9e6a87548e3ef upstream.

This removes a WARN_ON that is responsible for the following koops:
http://www.kerneloops.org/searchweek.php?search=b43_generate_noise_sample

The comment in the patch describes why it's safe to simply remove
the check.

Signed-off-by: Michael Buesch 
Signed-off-by: John W. Linville 
Signed-off-by: Greg Kroah-Hartman