linux.git/net/wireless/reg.c, branch v2.6.32

trivial: remove duplicate "different" from comment

2009-08-14T13:14:02+00:00

Signed-off-by: Thadeu Lima de Souza Cascardo 
Signed-off-by: John W. Linville

mac80211: remove max_bandwidth

2009-08-14T13:13:53+00:00

This removes the max_bandwidth attribute.  It is only ever
written to, and is duplicated by max_bandwidth_khz in the
regulatory code.

Signed-off-by: Pat Erley 
Acked-by: Johannes Berg 
Signed-off-by: John W. Linville

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

2009-08-13T00:44:53+00:00

Conflicts:
	arch/microblaze/include/asm/socket.h

cfg80211: enable country IE support to all cfg80211 drivers

2009-08-04T20:44:19+00:00

Since the bss is always set now once we are connected, if the
bss has its own information element we refer to it and pass that
instead of relying on mac80211's parsing.

Now all cfg80211 drivers get country IE support, automatically and
we reduce the call overhead that we had on mac80211 which called this
upon every beacon and instead now call this only upon a successfull
connection by a STA on cfg80211.

Acked-by: Johannes Berg 
Signed-off-by: Luis R. Rodriguez 
Signed-off-by: John W. Linville

cfg80211: decouple regulatory variables from cfg80211_mutex

2009-08-04T20:44:18+00:00

We change regulatory code to be protected by its own regulatory
mutex and alleviate cfg80211_mutex to only be used to protect
cfg80211_rdev_list, the registered device list.

By doing this we will be able to work on regulatory core components
without having to have hog up the cfg80211_mutex. An example here is
we no longer need to use the cfg80211_mutex during driver specific
wiphy_apply_custom_regulatory(). We also no longer need it for the
the country IE regulatory hint; by doing so we end up curing this
new lockdep warning:

=======================================================
[ INFO: possible circular locking dependency detected ]
2.6.31-rc4-wl #12
-------------------------------------------------------
phy1/1709 is trying to acquire lock:
 (cfg80211_mutex){+.+.+.}, at: [] regulatory_hint_11d+0x32/0x3f0 [cfg80211]

but task is already holding lock:
 (&ifmgd->mtx){+.+.+.}, at: [] ieee80211_sta_work+0x108/0x10f0 [mac80211]

which lock already depends on the new lock.

the existing dependency chain (in reverse order) is:

-> #3 (&ifmgd->mtx){+.+.+.}:
       [] __lock_acquire+0xd76/0x12b0
       [] lock_acquire+0xe3/0x120
       [] mutex_lock_nested+0x44/0x350
       [] ieee80211_mgd_auth+0x108/0x1f0 [mac80211]
       [] ieee80211_auth+0x13/0x20 [mac80211]
       [] __cfg80211_mlme_auth+0x1b1/0x2a0 [cfg80211]
       [] cfg80211_mlme_auth+0x86/0xc0 [cfg80211]
       [] nl80211_authenticate+0x21d/0x230 [cfg80211]
       [] genl_rcv_msg+0x1b6/0x1f0
       [] netlink_rcv_skb+0x89/0xb0
       [] genl_rcv+0x29/0x40
       [] netlink_unicast+0x29d/0x2b0
       [] netlink_sendmsg+0x214/0x300
       [] sock_sendmsg+0x107/0x130
       [] sys_sendmsg+0x189/0x320
       [] system_call_fastpath+0x16/0x1b
       [] 0xffffffffffffffff

-> #2 (&wdev->mtx){+.+.+.}:
       [] __lock_acquire+0xd76/0x12b0
       [] lock_acquire+0xe3/0x120
       [] mutex_lock_nested+0x44/0x350
       [] cfg80211_netdev_notifier_call+0x1a4/0x390 [cfg80211]
       [] notifier_call_chain+0x3f/0x80
       [] raw_notifier_call_chain+0x11/0x20
       [] dev_open+0x10a/0x120
       [] dev_change_flags+0x9d/0x1e0
       [] devinet_ioctl+0x6fe/0x760
       [] inet_ioctl+0x94/0xc0
       [] sock_ioctl+0x6a/0x290
       [] vfs_ioctl+0x31/0xa0
       [] do_vfs_ioctl+0x8a/0x5c0
       [] sys_ioctl+0x99/0xa0
       [] system_call_fastpath+0x16/0x1b
       [] 0xffffffffffffffff

-> #1 (&rdev->mtx){+.+.+.}:
       [] __lock_acquire+0xd76/0x12b0
       [] lock_acquire+0xe3/0x120
       [] mutex_lock_nested+0x44/0x350
       [] cfg80211_get_dev_from_ifindex+0x60/0x90 [cfg80211]
       [] get_rdev_dev_by_info_ifindex+0x6f/0xa0 [cfg80211]
       [] nl80211_set_interface+0x3b/0x260 [cfg80211]
       [] genl_rcv_msg+0x1b6/0x1f0
       [] netlink_rcv_skb+0x89/0xb0
       [] genl_rcv+0x29/0x40
       [] netlink_unicast+0x29d/0x2b0
       [] netlink_sendmsg+0x214/0x300
       [] sock_sendmsg+0x107/0x130
       [] sys_sendmsg+0x189/0x320
       [] system_call_fastpath+0x16/0x1b
       [] 0xffffffffffffffff

other info that might help us debug this:

3 locks held by phy1/1709:
 #0:  ((wiphy_name(local->hw.wiphy))){+.+.+.}, at: [] worker_thread+0x19d/0x340
 #1:  (&ifmgd->work){+.+.+.}, at: [] worker_thread+0x19d/0x340
 #2:  (&ifmgd->mtx){+.+.+.}, at: [] ieee80211_sta_work+0x108/0x10f0 [mac80211]

Reported-by: Reinette Chatre 
Acked-by: Johannes Berg 
Signed-off-by: Luis R. Rodriguez 
Signed-off-by: John W. Linville

cfg80211: do not iterate over rdev list on country IE hint

2009-08-04T20:44:18+00:00

Simplify the country IE hint code by just bailing out if
a previous country IE has been issued. We currently just trust
the first AP we connect to on any card. The idea was to perform
conflict resolution within this routine but since we can no longer
iterate over the registered device list here we leave conflict
resolution to be dealt with at a later time on the workqueue.

This code has no functional changes other than saving us an
interation over the registered device list when a second card
is connected, or you unplug and connect the same one, and a
country IE is received. This would have been done upon every
beacon received.

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

cfg80211: use goto out on country IE reg hint failure

2009-08-04T20:44:18+00:00

This has no functional changes.

Acked-by: Johannes Berg 
Signed-off-by: Luis R. Rodriguez 
Signed-off-by: John W. Linville

cfg80211: fix regression on beacon world roaming feature

2009-08-03T20:31:21+00:00

A regression was added through patch a4ed90d6:

"cfg80211: respect API on orig_flags on channel for beacon hint"

We did indeed respect _orig flags but the intention was not clearly
stated in the commit log. This patch fixes firmware issues picked
up by iwlwifi when we lift passive scan of beaconing restrictions
on channels its EEPROM has been configured to always enable.

By doing so though we also disallowed beacon hints on devices
registering their wiphy with custom world regulatory domains
enabled, this happens to be currently ath5k, ath9k and ar9170.
The passive scan and beacon restrictions on those devices would
never be lifted even if we did find a beacon and the hardware did
support such enhancements when world roaming.

Since Johannes indicates iwlwifi firmware cannot be changed to
allow beacon hinting we set up a flag now to specifically allow
drivers to disable beacon hints for devices which cannot use them.

We enable the flag on iwlwifi to disable beacon hints and by default
enable it for all other drivers. It should be noted beacon hints lift
passive scan flags and beacon restrictions when we receive a beacon from
an AP on any 5 GHz non-DFS channels, and channels 12-14 on the 2.4 GHz
band. We don't bother with channels 1-11 as those channels are allowed
world wide.

This should fix world roaming for ath5k, ath9k and ar9170, thereby
improving scan time when we receive the first beacon from any AP,
and also enabling beaconing operation (AP/IBSS/Mesh) on cards which
would otherwise not be allowed to do so. Drivers not using custom
regulatory stuff (wiphy_apply_custom_regulatory()) were not affected
by this as the orig_flags for the channels would have been cleared
upon wiphy registration.

I tested this with a world roaming ath5k card.

Cc: Jouni Malinen 
Signed-off-by: Luis R. Rodriguez 
Reviewed-by: Johannes Berg 
Signed-off-by: John W. Linville

cfg80211: treat ieee80211_regdom hints as user hints

2009-07-24T19:05:19+00:00

We were treating ieee80211_regdom module parameter hints
as core hints, this means we were not letting the user help
compliance further when using the module parameter. It also
meant that users with a device with a custom regulatory
domain set (wiphy->custom_regulatory) using this module
parameter were being stuck to the original default core
static regualtory domain. We fix this by using the static
cfg80211_regdomain alpha2 as the core hint and treating the
module parameter separately.

All iwlwifi and ath5k/ath9k/ar9170 devices which world roam
set the wiphy->custom_regulatory. This change allows users
using this module parameter to have it trated as a a proper
user hint and not have it ignored.

Signed-off-by: Luis R. Rodriguez 
Acked-by: Johannes Berg 
Signed-off-by: John W. Linville

cfg80211: clean up naming once and for all

2009-07-10T19:02:33+00:00

We've named the registered devices 'drv' sometimes,
thinking of "driver", which is not what it is, it's
the internal representation of a wiphy, i.e. a
device. Let's clean up the naming once and and use
'rdev' aka 'registered device' everywhere.

Signed-off-by: Johannes Berg 
Signed-off-by: John W. Linville