linux-stable.git/net/wireless/core.c, branch v3.2

Merge branch 'master' of github.com:davem330/net

2011-09-22T07:23:13+00:00

Conflicts:
	MAINTAINERS
	drivers/net/Kconfig
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c

cfg80211: hold reg_mutex when updating regulatory

2011-09-14T17:26:39+00:00

The function wiphy_update_regulatory() uses the static variable
last_request and thus needs to be called with reg_mutex held.
This is the case for all users in reg.c, but the function was
exported for use by wiphy_register(), from where it is called
without the lock being held.

Fix this by making wiphy_update_regulatory() private and introducing
regulatory_update() as a wrapper that acquires and holds the lock.

Signed-off-by: Sven Neumann 
Cc: John W. Linville 
Cc: Luis R. Rodriguez 
Cc: Daniel Mack 
Cc: linux-wireless@vger.kernel.org
Acked-by:  Luis R. Rodriguez 
Signed-off-by: John W. Linville

mac80211: fix suspend/resume races with unregister hw

2011-08-22T18:21:40+00:00

Do not call ->suspend, ->resume methods after we unregister wiphy. Also
delete sta_clanup timer after we finish wiphy unregister to avoid this:

WARNING: at lib/debugobjects.c:262 debug_print_object+0x85/0xa0()
Hardware name: 6369CTO
ODEBUG: free active (active state 0) object type: timer_list hint: sta_info_cleanup+0x0/0x180 [mac80211]
Modules linked in: aes_i586 aes_generic fuse bridge stp llc autofs4 sunrpc cpufreq_ondemand acpi_cpufreq mperf ext2 dm_mod uinput thinkpad_acpi hwmon sg arc4 rt2800usb rt2800lib crc_ccitt rt2x00usb rt2x00lib mac80211 cfg80211 i2c_i801 iTCO_wdt iTCO_vendor_support e1000e ext4 mbcache jbd2 sd_mod crc_t10dif sr_mod cdrom yenta_socket ahci libahci pata_acpi ata_generic ata_piix i915 drm_kms_helper drm i2c_algo_bit video [last unloaded: microcode]
Pid: 5663, comm: pm-hibernate Not tainted 3.1.0-rc1-wl+ #19
Call Trace:
 [] warn_slowpath_common+0x6d/0xa0
 [] ? debug_print_object+0x85/0xa0
 [] ? debug_print_object+0x85/0xa0
 [] warn_slowpath_fmt+0x2e/0x30
 [] debug_print_object+0x85/0xa0
 [] ? sta_info_alloc+0x1a0/0x1a0 [mac80211]
 [] debug_check_no_obj_freed+0xe2/0x180
 [] kfree+0x8b/0x150
 [] cfg80211_dev_free+0x7e/0x90 [cfg80211]
 [] wiphy_dev_release+0xd/0x10 [cfg80211]
 [] device_release+0x19/0x80
 [] kobject_release+0x7a/0x1c0
 [] ? rtnl_unlock+0x8/0x10
 [] ? wiphy_resume+0x6b/0x80 [cfg80211]
 [] ? kobject_del+0x30/0x30
 [] kref_put+0x2d/0x60
 [] kobject_put+0x1d/0x50
 [] ? mutex_lock+0x14/0x40
 [] put_device+0xf/0x20
 [] dpm_resume+0xca/0x160
 [] hibernation_snapshot+0xcd/0x260
 [] ? freeze_processes+0x3f/0x90
 [] hibernate+0xcb/0x1e0
 [] ? pm_async_store+0x40/0x40
 [] state_store+0xa0/0xb0
 [] ? pm_async_store+0x40/0x40
 [] kobj_attr_store+0x20/0x30
 [] sysfs_write_file+0x94/0xf0
 [] vfs_write+0x9a/0x160
 [] ? sysfs_open_file+0x200/0x200
 [] sys_write+0x3d/0x70
 [] sysenter_do_call+0x12/0x28

Cc: stable@kernel.org
Signed-off-by: Stanislaw Gruszka 
Signed-off-by: John W. Linville

cfg80211: enter psm when working as p2p_cli

2011-07-20T19:04:35+00:00

cfg80211_netdev_notifier_call() is configuring psm in case
of NL80211_IFTYPE_STATION interface type (on NETDEV_UP).
do the same for NL80211_IFTYPE_P2P_CLIENT interface type.

Signed-off-by: Eliad Peller 
Reviewed-by: Johannes Berg 
Signed-off-by: John W. Linville

nl80211: advertise GTK rekey support, new triggers

2011-07-15T17:38:28+00:00

Since we now have the necessary API in place to support
GTK rekeying, applications will need to know whether it
is supported by a device. Add a pseudo-trigger that is
used only to advertise that capability. Also, add some
new triggers that match what iwlagn devices can do.

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

cfg80211: fix deadlock with rfkill/sched_scan by adding new mutex

2011-07-05T18:42:36+00:00

There was a deadlock when rfkill-blocking a wireless interface,
because we were locking the rdev mutex on NETDEV_GOING_DOWN to stop
sched_scans that were eventually running.  The rfkill block code was
already holding a mutex under rdev:

kernel: =======================================================
kernel: [ INFO: possible circular locking dependency detected ]
kernel: 3.0.0-rc1-00049-g1fa7b6a #57
kernel: -------------------------------------------------------
kernel: kworker/0:1/4525 is trying to acquire lock:
kernel: (&rdev->mtx){+.+.+.}, at: [] cfg80211_netdev_notifier_call+0x131/0x5b0
kernel:
kernel: but task is already holding lock:
kernel: (&rdev->devlist_mtx){+.+.+.}, at: [] cfg80211_rfkill_set_block+0x4f/0xa0
kernel:
kernel: which lock already depends on the new lock.

To fix this, add a new mutex specifically for sched_scan, to protect
the sched_scan_req element in the rdev struct, instead of using the
global rdev mutex.

Reported-by: Duane Griffin 
Signed-off-by: Luciano Coelho 
Signed-off-by: John W. Linville

cfg80211: advertise possible interface combinations

2011-05-16T18:10:40+00:00

Add the ability to advertise interface combinations in nl80211.
This allows the driver to indicate what the combinations are
that it supports. "Combinations" of just a single interface are
implicit, as previously. Note that cfg80211 will enforce that
the restrictions are met, but not for all drivers yet (once all
drivers are updated, we can remove the flag and enforce for all).

When no combinations are actually supported, an empty list will
be exported so that userspace can know if the kernel exported
this info or not (although it isn't clear to me what tools using
the info should do if the kernel didn't export it).

Since some interface types are purely virtual/software and don't
fit the restrictions, those are exposed in a new list of pure SW
types, not subject to restrictions. This mainly exists to handle
AP-VLAN and monitor interfaces in mac80211.

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

cfg80211/mac80211: avoid bounce back mac->cfg->mac on sched_scan_stopped

2011-05-12T18:10:55+00:00

When sched_scan_stopped was called by the driver, mac80211 calls
cfg80211, which in turn was calling mac80211 back with a flag
"driver_initiated".  This flag was used so that mac80211 would do the
necessary cleanup but would not call the driver.  This was enough to
prevent the bounce back between the driver and mac80211, but not
between mac80211 and cfg80211.

To fix this, we now do the cleanup in mac80211 before calling
cfg80211.  To help with locking issues, the workqueue was moved from
cfg80211 to mac80211.

Reported-by: Johannes Berg 
Signed-off-by: Luciano Coelho 
Signed-off-by: John W. Linville

cfg80211: restrict AP beacon intervals

2011-05-12T18:10:47+00:00

Multiple virtual AP interfaces can currently try
to use different beacon intervals, but that just
leads to problems since it won't actually be done
that way by drivers. Return an error in this case
to make sure it won't be done wrong.

Also, ignore attempts to change the DTIM period
or beacon interval during the lifetime of the BSS.

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

cfg80211/nl80211: add support for scheduled scans

2011-05-11T19:12:26+00:00

Implement new functionality for scheduled scan offload.  With this feature we
can scan automatically at certain intervals.

The idea is that the hardware can perform scan automatically and filter on
desired results without waking up the host unnecessarily.

Add NL80211_CMD_START_SCHED_SCAN and NL80211_CMD_STOP_SCHED_SCAN
commands to the nl80211 interface.  When results are available they are
reported by NL80211_CMD_SCHED_SCAN_RESULTS events.  The userspace is
informed when the scheduled scan has stopped with a
NL80211_CMD_SCHED_SCAN_STOPPED event, which can be triggered either by
the driver or by a call to NL80211_CMD_STOP_SCHED_SCAN.

Signed-off-by: Luciano Coelho 
Signed-off-by: John W. Linville