linux-toradex.git/net/wireless, branch v2.6.38.6

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

2011-02-22T19:53:05+00:00

fix cfg80211_wext_siwfreq lock ordering...

2011-02-21T20:14:25+00:00

I previously managed to reproduce a hang while scanning wireless
channels (reproducible with airodump-ng hopping channels); subsequent
lockdep instrumentation revealed a lock ordering issue.

Without knowing the design intent, it looks like the locks should be
taken in reverse order; please comment.

=======================================================
[ INFO: possible circular locking dependency detected ]
2.6.38-rc5-341cd #4
-------------------------------------------------------
airodump-ng/15445 is trying to acquire lock:
 (&rdev->devlist_mtx){+.+.+.}, at: []
cfg80211_wext_siwfreq+0xc6/0x100

but task is already holding lock:
 (&wdev->mtx){+.+.+.}, at: [] cfg80211_wext_siwfreq+0xbc/0x100

which lock already depends on the new lock.

the existing dependency chain (in reverse order) is:

-> #1 (&wdev->mtx){+.+.+.}:
       [] lock_acquire+0xc6/0x280
       [] mutex_lock_nested+0x6e/0x4b0
       [] cfg80211_netdev_notifier_call+0x430/0x5f0
       [] notifier_call_chain+0x8b/0x100
       [] raw_notifier_call_chain+0x11/0x20
       [] call_netdevice_notifiers+0x32/0x60
       [] __dev_notify_flags+0x34/0x80
       [] dev_change_flags+0x40/0x70
       [] do_setlink+0x1fc/0x8d0
       [] rtnl_setlink+0xf2/0x140
       [] rtnetlink_rcv_msg+0x163/0x270
       [] netlink_rcv_skb+0xa1/0xd0
       [] rtnetlink_rcv+0x20/0x30
       [] netlink_unicast+0x2ba/0x300
       [] netlink_sendmsg+0x267/0x3e0
       [] sock_sendmsg+0xe4/0x110
       [] sys_sendmsg+0x253/0x3b0
       [] system_call_fastpath+0x16/0x1b

-> #0 (&rdev->devlist_mtx){+.+.+.}:
       [] __lock_acquire+0x1622/0x1d10
       [] lock_acquire+0xc6/0x280
       [] mutex_lock_nested+0x6e/0x4b0
       [] cfg80211_wext_siwfreq+0xc6/0x100
       [] ioctl_standard_call+0x5d/0xd0
       [] T.808+0x163/0x170
       [] wext_handle_ioctl+0x3a/0x90
       [] dev_ioctl+0x6f2/0x830
       [] sock_ioctl+0xfd/0x290
       [] do_vfs_ioctl+0x9d/0x590
       [] sys_ioctl+0x4a/0x80
       [] system_call_fastpath+0x16/0x1b

other info that might help us debug this:

2 locks held by airodump-ng/15445:
 #0:  (rtnl_mutex){+.+.+.}, at: [] rtnl_lock+0x12/0x20
 #1:  (&wdev->mtx){+.+.+.}, at: []
cfg80211_wext_siwfreq+0xbc/0x100

stack backtrace:
Pid: 15445, comm: airodump-ng Not tainted 2.6.38-rc5-341cd #4
Call Trace:
 [] ? print_circular_bug+0xfa/0x100
 [] ? __lock_acquire+0x1622/0x1d10
 [] ? trace_hardirqs_off_caller+0x29/0xc0
 [] ? lock_acquire+0xc6/0x280
 [] ? cfg80211_wext_siwfreq+0xc6/0x100
 [] ? mark_held_locks+0x67/0x90
 [] ? mutex_lock_nested+0x6e/0x4b0
 [] ? cfg80211_wext_siwfreq+0xc6/0x100
 [] ? mark_held_locks+0x67/0x90
 [] ? cfg80211_wext_siwfreq+0xc6/0x100
 [] ? cfg80211_wext_siwfreq+0xc6/0x100
 [] ? ioctl_standard_call+0x5d/0xd0
 [] ? __dev_get_by_name+0x9b/0xc0
 [] ? ioctl_standard_call+0x0/0xd0
 [] ? T.808+0x163/0x170
 [] ? might_fault+0x72/0xd0
 [] ? wext_handle_ioctl+0x3a/0x90
 [] ? might_fault+0xbb/0xd0
 [] ? dev_ioctl+0x6f2/0x830
 [] ? put_lock_stats+0xe/0x40
 [] ? lock_release_holdtime+0xac/0x150
 [] ? sock_ioctl+0xfd/0x290
 [] ? do_vfs_ioctl+0x9d/0x590
 [] ? fget_light+0x1df/0x3c0
 [] ? sys_ioctl+0x4a/0x80
 [] ? system_call_fastpath+0x16/0x1b

Signed-off-by: Daniel J Blueman 
Acked-by: Johannes Berg 
Signed-off-by: John W. Linville

kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT

2011-01-21T01:02:05+00:00

The meaning of CONFIG_EMBEDDED has long since been obsoleted; the option
is used to configure any non-standard kernel with a much larger scope than
only small devices.

This patch renames the option to CONFIG_EXPERT in init/Kconfig and fixes
references to the option throughout the kernel.  A new CONFIG_EMBEDDED
option is added that automatically selects CONFIG_EXPERT when enabled and
can be used in the future to isolate options that should only be
considered for embedded systems (RISC architectures, SLOB, etc).

Calling the option "EXPERT" more accurately represents its intention: only
expert users who understand the impact of the configuration changes they
are making should enable it.

Reviewed-by: Ingo Molnar 
Acked-by: David Woodhouse 
Signed-off-by: David Rientjes 
Cc: Greg KH 
Cc: "David S. Miller" 
Cc: Jens Axboe 
Cc: Arnd Bergmann 
Cc: Robin Holt 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

cfg80211: fix transposition of words in printk

2011-01-04T19:43:01+00:00

Fixes the misplaced article in the following:

"cfg80211: Updating information on frequency 5785 MHz for
    20 a MHz width channel with regulatory rule:"

Signed-off-by: Bob Copeland 
Signed-off-by: John W. Linville

nl80211: Export available antennas

2010-12-20T19:49:47+00:00

Export the information which antennas are available for configuration as TX or
RX antennas via nl80211.

Signed-off-by: Bruno Randolf 
Signed-off-by: John W. Linville

cfg80211: Separate available antennas for RX and TX

2010-12-20T19:46:58+00:00

As has been pointed out by Daniel Halperin some devices (e.g. Intel IWL5100)
can only TX from a subset of RX antennas, so use separate availability masks
for RX and TX.

Signed-off-by: Bruno Randolf 
Signed-off-by: John W. Linville

mac80211: Send mesh non-HWMP path selection frames to userspace

2010-12-20T19:46:58+00:00

Let path selection frames for protocols other than HWMP be sent to
userspace via NL80211_CMD_REGISTER_FRAME.  Also allow userspace to send
and receive mesh path selection frames.

Signed-off-by: Javier Cardona 
Signed-off-by: John W. Linville

mac80211: Let userspace enable and configure vendor specific path selection.

2010-12-20T19:46:57+00:00

Userspace will now be allowed to toggle between the default path
selection algorithm (HWMP, implemented in the kernel), and a vendor
specific alternative.  Also in the same patch, allow userspace to add
information elements to mesh beacons.  This is accordance with the
Extensible Path Selection Framework specified in version 7.0 of the
802.11s draft.

Signed-off-by: Javier Cardona 
Signed-off-by: John W. Linville

mac80211: Rename mesh_params to mesh_config to prepare for mesh_setup

2010-12-20T19:46:57+00:00

Mesh parameters can be to setup a mesh or to configure it.
This patch renames the ambiguous name mesh_params to mesh_config
in preparation for mesh_setup.

Signed-off-by: Javier Cardona 
Signed-off-by: John W. Linville

cfg80211: fix null pointer dereference with a custom regulatory request

2010-12-16T20:22:31+00:00

Once we moved the core regulatory request to the queue and let
the scheduler process it last_request will have been left NULL
until the schedular decides to process the first request. When
this happens and we are loading a driver with a custom regulatory
request like all Atheros drivers we end up with a NULL pointer
dereference. We fix this by checking if the request was a
custom one.

BUG: unable to handle kernel NULL pointer dereference at 0000000000000004
IP: [] freq_reg_info_regd.clone.2+0x27/0x130 [cfg80211]
PGD 71f91067 PUD 712b2067 PMD 0
Oops: 0000 [#1] PREEMPT SMP
last sysfs file: /sys/devices/pci0000:00/0000:00:1d.7/usb2/2-1/firmware/2-1/loading
CPU 0
Modules linked in: ath9k_htc(+) ath9k_common ath9k_hw ath 
Pid: 3094, comm: insmod Tainted: G        W   2.6.37-rc5-wl #16 INVALID/28427ZQ
RIP: 0010:[]  [] freq_reg_info_regd.clone.2+0x27/0x130 [cfg80211]
RSP: 0018:ffff88007045db78  EFLAGS: 00010282
RAX: 0000000000000000 RBX: ffffffffa047d9a0 RCX: ffff88007045dbd0
RDX: 0000000000004e20 RSI: 000000000024cde0 RDI: ffff8800700483e0
RBP: ffff88007045db98 R08: ffffffffa02f5b40 R09: 0000000000000001
R10: 000000000000000e R11: 0000000000000001 R12: 0000000000000000
R13: ffff88007004e3b0 R14: 0000000000000000 R15: ffff880070048340
FS:  00007f635a707700(0000) GS:ffff880077400000(0000) knlGS:0000000000000000
CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
CR2: 0000000000000004 CR3: 00000000708a9000 CR4: 00000000000006f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
Process insmod (pid: 3094, threadinfo ffff88007045c000, task ffff8800713e3ec0)
Stack:
 ffffffffa047d9a0 0000000000000000 ffff88007004e3b0 0000000000000000
 ffff88007045dc08 ffffffffa016e147 000000007045dc08 0000000000000002
 ffff8800700483e0 ffffffffa02f5b40 ffff88007045dbd8 0000000000000000
Call Trace:
 [] wiphy_apply_custom_regulatory+0x137/0x1d0 [cfg80211]
 [] ? ath9k_reg_notifier+0x0/0x50 [ath9k_htc]
 [] ath_regd_init+0x347/0x430 [ath]
 [] ath9k_htc_probe_device+0x6c5/0x960 [ath9k_htc]
 [] ath9k_htc_hw_init+0xc/0x30 [ath9k_htc]
 [] ath9k_hif_usb_probe+0x216/0x3b0 [ath9k_htc]
 [] usb_probe_interface+0x10c/0x210 [usbcore]
 [] driver_probe_device+0x96/0x1c0
 [] __driver_attach+0xa3/0xb0
 [] ? __driver_attach+0x0/0xb0
 [] bus_for_each_dev+0x5e/0x90
 [] driver_attach+0x19/0x20
 [] bus_add_driver+0x168/0x320
 [] driver_register+0x71/0x140
 [] ? __raw_spin_lock_init+0x38/0x70
 [] usb_register_driver+0xdc/0x190 [usbcore]
 [] ? ath9k_htc_init+0x0/0x4f [ath9k_htc]
 [] ath9k_hif_usb_init+0x1e/0x20 [ath9k_htc]
 [] ath9k_htc_init+0x2b/0x4f [ath9k_htc]
 [] do_one_initcall+0x3f/0x180
 [] sys_init_module+0xbb/0x200
 [] system_call_fastpath+0x16/0x1b
Code: 
RIP  [] freq_reg_info_regd.clone.2+0x27/0x130 [cfg80211]
 RSP 
CR2: 0000000000000004
---[ end trace 79e4193601c8b713 ]---

Reported-by: Sujith Manoharan 
Signed-off-by: Luis R. Rodriguez 
Signed-off-by: John W. Linville