forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
linux-pinenote/drivers/net/wireless/ath/ath9k
History
David S. Miller d98cae64e4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/wireless/ath/ath9k/Kconfig
	drivers/net/xen-netback/netback.c
	net/batman-adv/bat_iv_ogm.c
	net/wireless/nl80211.c

The ath9k Kconfig conflict was a change of a Kconfig option name right
next to the deletion of another option.

The xen-netback conflict was overlapping changes involving the
handling of the notify list in xen_netbk_rx_action().

Batman conflict resolution provided by Antonio Quartulli, basically
keep everything in both conflict hunks.

The nl80211 conflict is a little more involved.  In 'net' we added a
dynamic memory allocation to nl80211_dump_wiphy() to fix a race that
Linus reported.  Meanwhile in 'net-next' the handlers were converted
to use pre and post doit handlers which use a flag to determine
whether to hold the RTNL mutex around the operation.

However, the dump handlers to not use this logic.  Instead they have
to explicitly do the locking.  There were apparent bugs in the
conversion of nl80211_dump_wiphy() in that we were not dropping the
RTNL mutex in all the return paths, and it seems we very much should
be doing so.  So I fixed that whilst handling the overlapping changes.

To simplify the initial returns, I take the RTNL mutex after we try
to allocate 'tb'.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-06-19 16:49:39 -07:00
..
ahb.c net: wireless: remove unnecessary platform_set_drvdata() 2013-05-27 22:34:52 -07:00
ani.c ath9k: Do not maintain ANI state per-channel 2013-06-03 15:55:48 -04:00
ani.h ath9k: Print ANI statistics in debugfs 2013-06-03 15:55:47 -04:00
antenna.c ath9k: Add a module parameter to enable diversity 2012-09-24 14:59:11 -04:00
ar955x_1p0_initvals.h ath9k_hw: Update initvals for QCA955x 2013-01-09 14:37:11 -05:00
ar5008_initvals.h ath9k: fix column header comments for some initval arrays 2013-01-07 15:16:53 -05:00
ar5008_phy.c ath9k: Do not maintain ANI state per-channel 2013-06-03 15:55:48 -04:00
ar9001_initvals.h ath9k: fix column header comments for some initval arrays 2013-01-07 15:16:53 -05:00
ar9002_calib.c Show actual timeout value in failed calibration messages. 2013-03-27 13:39:08 -04:00
ar9002_hw.c ath9k: Enable WoW only for AR9462 2013-06-03 15:55:46 -04:00
ar9002_initvals.h ath9k: Enable WoW only for AR9462 2013-06-03 15:55:46 -04:00
ar9002_mac.c
ar9002_phy.c ath9k_hw: ar9002_hw_spectral_scan_config() can be static 2013-01-14 15:10:40 -05:00
ar9002_phy.h
ar9003_2p2_initvals.h Revert "ath9k_hw: Update rx gain initval to improve rx sensitivity" 2013-06-12 10:20:58 -04:00
ar9003_calib.c ath9k_hw: Enable manual peak calibration for AR9485 2013-05-17 14:31:08 -04:00
ar9003_eeprom.c ath9k_hw: Fix fixed antenna for AR9462 2013-03-06 16:28:57 -05:00
ar9003_eeprom.h ath9k: use correct OTP register offsets for AR9550 2013-05-28 13:43:10 -04:00
ar9003_hw.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2013-01-28 13:54:03 -05:00
ar9003_mac.c ath9k: remove useless flag conversation. 2013-05-30 14:42:34 -04:00
ar9003_mac.h
ar9003_mci.c ath9k: Fix MCI reset in BT cal_req 2012-11-21 14:16:01 -05:00
ar9003_mci.h ath9k: Add new BT profile info A2DP_Voice 2012-10-29 15:19:30 -04:00
ar9003_paprd.c ath9k_hw: fix PA predistortion miscalibration 2013-05-29 15:22:42 -04:00
ar9003_phy.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2013-06-11 14:48:32 -04:00
ar9003_phy.h ath9k_hw: Add TempCompensation feature for AR9550 2013-01-09 14:37:11 -05:00
ar9003_rtt.c
ar9003_rtt.h
ar9330_1p1_initvals.h ath9k: de-duplicate initvals 2012-06-28 14:37:47 -04:00
ar9330_1p2_initvals.h ath9k: de-duplicate initvals 2012-06-28 14:37:47 -04:00
ar9340_initvals.h ath9k_hw: add tx gain tables for newer devices 2013-01-11 14:50:00 -05:00
ar9462_2p0_initvals.h ath9k_hw: Update initvals for AR9462 2013-03-06 16:28:56 -05:00
ar9485_initvals.h ath9k_hw: Enable manual peak calibration for AR9485 2013-05-17 14:31:08 -04:00
ar9565_1p0_initvals.h ath9k: Update initvals for AR9565 2013-05-08 17:15:08 -04:00
ar9580_1p0_initvals.h ath9k_hw: change AR9580 initvals to fix a stability issue 2013-04-12 13:22:09 -04:00
ath9k.h Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2013-06-11 14:48:32 -04:00
beacon.c ath9k: use ap style beaconing for mesh 2013-05-22 15:05:34 -04:00
btcoex.c ath9k: stomp audio profiles on weak signal strength 2012-11-21 14:16:01 -05:00
btcoex.h ath9k: stomp audio profiles on weak signal strength 2012-11-21 14:16:01 -05:00
calib.c Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next 2013-04-10 14:09:54 -04:00
calib.h ath9k_hw: make various ar5416/ar91xx rf banks const 2013-04-10 14:10:32 -04:00
common.c ath9k_common: remove ath9k_cmn_padpos 2013-04-10 14:10:33 -04:00
common.h ath9k_common: remove ath9k_cmn_padpos 2013-04-10 14:10:33 -04:00
debug.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2013-06-11 14:48:32 -04:00
debug.h Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2013-06-11 14:48:32 -04:00
dfs.c ath9k: change DFS logging to use ath_dbg() 2013-04-22 15:17:40 -04:00
dfs.h
dfs_debug.c net: wireless: replace strict_strtoul() with kstrtoul() 2013-06-03 00:39:46 -07:00
dfs_debug.h
dfs_pattern_detector.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2013-04-23 14:09:39 -04:00
dfs_pattern_detector.h ath9k: change DFS logging to use ath_dbg() 2013-04-22 15:17:40 -04:00
dfs_pri_detector.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2013-04-23 14:09:39 -04:00
dfs_pri_detector.h ath9k: change DFS logging to use ath_dbg() 2013-04-22 15:17:40 -04:00
eeprom.c ath9k: allow to load EEPROM content via firmware API 2012-12-10 15:49:57 -05:00
eeprom.h ath9k: use 'struct ath_hw *' as the first argument for 'ath9k_hw_nvram_read' 2012-12-10 15:49:56 -05:00
eeprom_4k.c ath9k: use 'struct ath_hw *' as the first argument for 'ath9k_hw_nvram_read' 2012-12-10 15:49:56 -05:00
eeprom_9287.c ath9k: use 'struct ath_hw *' as the first argument for 'ath9k_hw_nvram_read' 2012-12-10 15:49:56 -05:00
eeprom_def.c ath9k: use 'struct ath_hw *' as the first argument for 'ath9k_hw_nvram_read' 2012-12-10 15:49:56 -05:00
gpio.c ath9k/ath9k_htc: Remove WME macros 2012-11-21 14:16:02 -05:00
hif_usb.c ath9k_htc: Add PID/VID for a Ubiquiti WiFiStation 2012-10-24 13:18:08 -04:00
hif_usb.h wireless: ath9k-htc: only load firmware in need 2012-09-07 15:03:36 -04:00
htc.h ath9k_htc: Add support for mesh interfaces 2013-05-22 15:05:33 -04:00
htc_drv_beacon.c ath9k_htc: Add support for mesh interfaces 2013-05-22 15:05:33 -04:00
htc_drv_debug.c net: wireless: replace strict_strtoul() with kstrtoul() 2013-06-03 00:39:46 -07:00
htc_drv_gpio.c ath9k/ath9k_htc: Remove WME macros 2012-11-21 14:16:02 -05:00
htc_drv_init.c ath9k_htc: Claim support for mgmt frame protection 2013-05-22 15:05:34 -04:00
htc_drv_main.c ath9k: Simplify ANI initialization 2013-06-03 15:55:47 -04:00
htc_drv_txrx.c ath9k_htc: Add support for mesh interfaces 2013-05-22 15:05:33 -04:00
htc_hst.c ath9k_htc: Fix memory leak 2013-01-11 14:12:01 -05:00
htc_hst.h
hw-ops.h ath9k_hw: use the devres API for allocations 2013-01-07 15:16:51 -05:00
hw.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2013-06-11 14:48:32 -04:00
hw.h ath9k: Do not maintain ANI state per-channel 2013-06-03 15:55:48 -04:00
init.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-06-19 16:49:39 -07:00
Kconfig Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-06-19 16:49:39 -07:00
link.c ath9k: Simplify ANI initialization 2013-06-03 15:55:47 -04:00
mac.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2013-06-11 14:48:32 -04:00
mac.h ath9k: check for Rx-STBC flag and pass it to ieee80211 2013-05-30 14:42:35 -04:00
main.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2013-06-11 14:48:32 -04:00
Makefile ath9k: Use minstrel rate control by default 2013-06-12 10:20:58 -04:00
mci.c ath9k: Remove unused variables in ath_mci_cleanup 2013-02-01 14:27:24 -05:00
mci.h ath9k: Add new BT profile info A2DP_Voice 2012-10-29 15:19:30 -04:00
pci.c ath9k: use the devres API for allocations/mappings 2013-01-07 15:16:51 -05:00
phy.h
rc.c ath9k: prevent aggregation session deadlocks 2013-05-22 14:28:44 -04:00
rc.h ath9k: Use minstrel rate control by default 2013-06-12 10:20:58 -04:00
recv.c ath9k: Return early for invalid rates 2013-06-03 15:55:45 -04:00
reg.h ath9k_hw: improve performance for AR934x v1.3+ 2013-05-24 12:50:22 -04:00
wmi.c
wmi.h
wow.c ath9k: Enable WoW only for AR9462 2013-06-03 15:55:46 -04:00
xmit.c ath9k: prevent aggregation session deadlocks 2013-05-22 14:28:44 -04:00