linux.git/drivers/net/wireless/rt2x00, branch v2.6.36

rt2x00: do not use PCI resources before pci_enable_device()

2010-08-04T19:28:37+00:00

IRQ and resource[] may not have correct values until
after PCI hotplug setup occurs at pci_enable_device() time.

The semantic match that finds this problem is as follows:

// 
@@
identifier x;
identifier request ~= "pci_request.*|pci_resource.*";
@@

(
* x->irq
|
* x->resource
|
* request(x, ...)
)
 ...
*pci_enable_device(x)
// 

Signed-off-by: Kulikov Vasiliy 
Acked-by: Gertjan van Wingerde 
Acked-by: Ivo van Doorn 
Signed-off-by: John W. Linville

rt2500usb: disallow to set WEP key with non zero index

2010-07-27T18:59:59+00:00

On our hardware (050d:7050 Belkin Components F5D7050 Wireless G Adapter),
setting any WEP key with non zero index, cause rx frames corruption.

Note: perhaps (I did not check) this can be fixed differently - by using
hw_key_idx the same as true MAC key index. But according to the comment in
rt2x00mac_set_key():

"the hardware requires keys to be assigned in correct order (When key 1
is provided but key 0 is not, then the key is not found by the hardware
during RX)"

this will be quite problematic. Since WEP should not be used, disabling
hardware crypto offload for it will not hurt much. Beside static
one key WEP will still be offloaded.

Signed-off-by: Stanislaw Gruszka 
Acked-by: Ivo van Doorn 
Signed-off-by: John W. Linville

rt2500usb: truly disable encryption when initialize

2010-07-27T18:59:59+00:00

Without cipher part nullify of TXRX_CSR0 register we can receive
corrupted frames (removed IV or IVC), after reloading rt2500usb module
with nohwcrypt=1 option, if previous some keys were configured into
the hardware.

Signed-off-by: Stanislaw Gruszka 
Acked-by: Ivo van Doorn 
Signed-off-by: John W. Linville

rt2500usb: write keys to proper registers

2010-07-27T18:59:59+00:00

Fix rt2500usb hardware encryption broken by commit
96b61bafe22b2f2abcc833d651739edb977f1b1e
"rt2x00: Clean up USB vendor request buffer functions"

Signed-off-by: Stanislaw Gruszka 
Acked-by: Ivo van Doorn 
Signed-off-by: John W. Linville

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6

2010-07-27T15:59:19+00:00

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-commands.h

rt2x00: Fix regression for rt2500pci

2010-07-26T19:32:43+00:00

Since commit:
     commit f1aa4c541e98afa8b770a75ccaa8504d0bff44a7
     Author: Ivo van Doorn 
     Date:   Tue Jun 29 21:38:55 2010 +0200

     rt2x00: Write the BSSID to register when interface is added

mananged mode in rt2500pci was broken, due to intf->bssid containing
random data rather then the expected 00:00:00:00:00:00

This is corrected by sending the BSSID to rt2x00lib_config_intf
only in AP mode where the bssid is set to a valid value.

Signed-off-by: Ivo van Doorn 
Acked-by: Helmut Schaa 
Signed-off-by: John W. Linville

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-07-21T01:25:24+00:00

Conflicts:
	drivers/vhost/net.c
	net/bridge/br_device.c

Fix merge conflict in drivers/vhost/net.c with guidance from
Stephen Rothwell.

Revert the effects of net-2.6 commit 573201f36fd9c7c6d5218cdcd9948cee700b277d
since net-next-2.6 has fixes that make bridge netpoll work properly thus
we don't need it disabled.

Signed-off-by: David S. Miller

rt2x00: correct sparse warning in rt2x00debug.c

2010-07-20T20:49:41+00:00

  CHECK   drivers/net/wireless/rt2x00/rt2x00debug.c
drivers/net/wireless/rt2x00/rt2x00debug.c:193:28: warning: incorrect type in assignment (different base types)
drivers/net/wireless/rt2x00/rt2x00debug.c:193:28:    expected restricted __le32 [usertype] chip_rev
drivers/net/wireless/rt2x00/rt2x00debug.c:193:28:    got restricted __le16 [usertype] 

Signed-off-by: John W. Linville 
Acked-by: Ivo van Doorn

rt2x00: Fix lockdep warning in rt2x00lib_probe_dev()

2010-07-16T17:57:59+00:00

The rt2x00dev->intf_work workqueue is never initialized when a driver is
probed for a non-existent device (in this case rt2500usb). On such a
path we call rt2x00lib_remove_dev() to free any resources initialized
during the probe before we use INIT_WORK to initialize the workqueue.
This causes lockdep to get confused since the lock used in the workqueue
hasn't been initialized yet but is now being acquired during
cancel_work_sync() called by rt2x00lib_remove_dev().

Fix this by initializing the workqueue first before we attempt to probe
the device. This should make lockdep happy and avoid breaking any
assumptions about how the library cleans up after a probe fails.

phy0 -> rt2x00lib_probe_dev: Error - Failed to allocate device.
INFO: trying to register non-static key.
the code is fine but needs lockdep annotation.
turning off the locking correctness validator.
Pid: 2027, comm: modprobe Not tainted 2.6.35-rc5+ #60
Call Trace:
 [] register_lock_class+0x152/0x31f
 [] ? usb_control_msg+0xd5/0x111
 [] __lock_acquire+0xce/0xcf4
 [] ? trace_hardirqs_off+0xd/0xf
 [] ?  _raw_spin_unlock_irqrestore+0x33/0x41
 [] lock_acquire+0xd1/0xf7
 [] ? __cancel_work_timer+0x99/0x17e
 [] __cancel_work_timer+0xd0/0x17e
 [] ? __cancel_work_timer+0x99/0x17e
 [] cancel_work_sync+0xb/0xd
 [] rt2x00lib_remove_dev+0x25/0xb0 [rt2x00lib]
 [] rt2x00lib_probe_dev+0x380/0x3ed [rt2x00lib]
 [] ? __raw_spin_lock_init+0x31/0x52
 [] ? T.676+0xe/0x10 [rt2x00usb]
 [] rt2x00usb_probe+0x121/0x15e [rt2x00usb]
 [] usb_probe_interface+0x151/0x19e
 [] driver_probe_device+0xa7/0x136
 [] __driver_attach+0x4a/0x66
 [] ? __driver_attach+0x0/0x66
 [] bus_for_each_dev+0x54/0x89
 [] driver_attach+0x19/0x1b
 [] bus_add_driver+0xb4/0x204
 [] driver_register+0x98/0x109
 [] usb_register_driver+0xb2/0x173
 [] ? rt2500usb_init+0x0/0x20 [rt2500usb]
 [] rt2500usb_init+0x1e/0x20 [rt2500usb]
 [] do_one_initcall+0x6d/0x17a
 [] sys_init_module+0x9c/0x1e0
 [] system_call_fastpath+0x16/0x1b

Signed-off-by: Stephen Boyd 
Signed-off-by: John W. Linville

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

2010-07-13T19:57:29+00:00

Conflicts:
	drivers/net/wireless/wl12xx/wl1271_cmd.h