linux-sg2042/drivers/net/wireless/ath/ath9k
David S. Miller 4b87f92259 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	Documentation/networking/ip-sysctl.txt
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

Both conflicts were simply overlapping context.

A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-01-15 15:05:59 -05:00
..
Kconfig ath9k: Fix Kconfig for ATH9K_HTC 2013-01-04 14:34:27 -05:00
Makefile ath9k_hw: Add hardware code for WoW 2012-07-12 15:27:16 -04:00
ahb.c ath9k: add platform_device_id for AR9550 2012-07-09 16:36:24 -04:00
ani.c ath9k_hw: Add AR9565 HW support 2012-09-11 15:31:37 -04:00
ani.h ath9k: fix ANI operation in AP mode 2012-06-28 14:37:46 -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: add initvals for AR9550 2012-07-09 16:36:26 -04:00
ar5008_initvals.h
ar5008_phy.c ath9k_hw: rename mrcCCKOff to fix smatch warning 2012-06-22 14:44:05 -04:00
ar9001_initvals.h ath9k_hw: remove duplicate initvals 2012-02-27 14:05:41 -05:00
ar9002_calib.c ath: Convert ath_dbg(bar, ATH_DBG_<FOO>, to ath_dbg(bar, FOO 2011-12-19 14:35:31 -05:00
ar9002_hw.c ath9k_hw: remove redundant arguments to INIT_INI_ARRAY 2012-07-17 15:11:34 -04:00
ar9002_initvals.h ath9k_hw: INI changes for WoW for AR9002 chipsets 2012-07-12 15:27:16 -04:00
ar9002_mac.c ath9k: Gather and report IRQ sync_cause errors. 2012-04-16 14:16:58 -04:00
ar9002_phy.c ath9k: remove dead code 2012-04-12 15:10:32 -04:00
ar9002_phy.h ath9k: inline AR9271 1.0 INI overrides 2012-03-15 13:45:08 -04:00
ar9003_2p2_initvals.h Revert "ath9k_hw: Update AR9003 high_power tx gain table" 2012-12-10 15:47:28 -05:00
ar9003_calib.c ath9k_hw: Fix wrong peak detector DC offset 2012-11-16 14:11:14 -05:00
ar9003_eeprom.c ath9k: use 'struct ath_hw *' as the first argument for 'ath9k_hw_nvram_read' 2012-12-10 15:49:56 -05:00
ar9003_eeprom.h ath9k: ar9003: fix OTP register offsets for AR9340 2012-12-10 15:49:44 -05:00
ar9003_hw.c ath9k_hw: Fix RX gain initvals for AR9485 2013-01-02 14:38:28 -05:00
ar9003_mac.c ath9k_hw: Handle AR_INTR_SYNC_HOST1_(FATAL|PERR) on AR9003 2012-09-28 13:54:10 -04:00
ar9003_mac.h ath9k: Fix descriptor length for AR9462 2012-02-27 14:05:44 -05:00
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: Calculate the correct training power for PAPRD 2012-12-10 15:49:51 -05:00
ar9003_phy.c ath9k_hw: Program filter coefficients correctly 2012-11-16 14:29:11 -05:00
ar9003_phy.h ath9k_hw: Fix PAPRD registers for AR9485 2012-12-10 15:49:45 -05:00
ar9003_rtt.c ath9k_hw: Fix RTT calibration 2012-05-15 17:27:55 -04:00
ar9003_rtt.h ath9k_hw: Fix RTT calibration 2012-05-15 17:27:55 -04:00
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: Update intivals for AR9340 2012-12-10 15:49:52 -05:00
ar9462_2p0_initvals.h ath9k_hw: Fix wrong peak detector DC offset 2012-11-16 14:11:14 -05:00
ar9485_initvals.h ath9k_hw: Program filter coefficients correctly 2012-11-16 14:29:11 -05:00
ar9565_1p0_initvals.h ath9k_hw: Enable hw PLL power save for AR9565 2012-10-29 15:30:31 -04:00
ar9580_1p0_initvals.h ath9k: de-duplicate initvals 2012-06-28 14:37:47 -04:00
ath9k.h ath9k: Implement sta_add_debugfs/sta_remove_debugfs 2012-11-30 13:38:15 -05:00
beacon.c ath9k/ath9k_htc: Remove WME macros 2012-11-21 14:16:02 -05: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 ath9k_hw: Fix signal strength / channel noise reporting 2012-12-10 15:49:54 -05:00
calib.h ath9k_hw: Fix signal strength / channel noise reporting 2012-12-10 15:49:54 -05:00
common.c
common.h ath9k: Replace WME_NUM_TID with IEEE80211_NUM_TIDS 2012-11-30 13:38:15 -05:00
debug.c ath9k: Implement sta_add_debugfs/sta_remove_debugfs 2012-11-30 13:38:15 -05:00
debug.h ath9k: Fix regression in 'xmit' debugfs file 2012-12-10 15:47:30 -05:00
dfs.c ath9k: extend DFS detector stats in dfs_debugfs 2012-04-23 15:37:41 -04:00
dfs.h ath9k: update to DFS pattern detector interface 2012-04-11 16:23:54 -04:00
dfs_debug.c ath9k: extend DFS detector stats in dfs_debugfs 2012-04-23 15:37:41 -04:00
dfs_debug.h ath9k: extend DFS detector stats in dfs_debugfs 2012-04-23 15:37:41 -04:00
dfs_pattern_detector.c ath9k: [DFS] add pulse width tolerance for ETSI 2012-11-16 14:11:13 -05:00
dfs_pattern_detector.h ath9k: resolve name collision in DFS detector 2012-11-14 14:55:32 -05:00
dfs_pri_detector.c ath9k: extend DFS detector stats in dfs_debugfs 2012-04-23 15:37:41 -04:00
dfs_pri_detector.h ath9k: add DFS pattern detector 2012-04-11 16:23:52 -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/ath9k_htc: Remove WME macros 2012-11-21 14:16:02 -05:00
htc_drv_beacon.c ath9k/ath9k_htc: Remove WME macros 2012-11-21 14:16:02 -05:00
htc_drv_debug.c ath9k/ath9k_htc: Remove WME macros 2012-11-21 14:16:02 -05:00
htc_drv_gpio.c ath9k/ath9k_htc: Remove WME macros 2012-11-21 14:16:02 -05:00
htc_drv_init.c net: use ETHTOOL_FWVERS_LEN instead of ETHTOOL_BUSINFO_LEN for fw_ver strings 2013-01-06 21:06:31 -08:00
htc_drv_main.c ath9k/ath9k_htc: Remove WME macros 2012-11-21 14:16:02 -05:00
htc_drv_txrx.c ath9k_htc: RX timestamp is reported at end of frame 2012-12-11 16:00:38 -05:00
htc_hst.c ath: Add and use pr_fmt, convert printks to pr_<level> 2012-04-10 14:52:13 -04:00
htc_hst.h
hw-ops.h ath9k_hw: Add a HW callback to set diversity 2012-09-24 14:59:11 -04:00
hw.c ath9k_hw: Add HW cap for PAPRD 2012-12-10 15:49:50 -05:00
hw.h ath9k: allow to load EEPROM content via firmware API 2012-12-10 15:49:57 -05:00
init.c ath9k: check pdata variable before dereferencing it 2012-12-11 16:00:39 -05:00
link.c ath9k_hw: Add HW cap for PAPRD 2012-12-10 15:49:50 -05:00
mac.c ath9k: fix interrupt storms on queued hardware reset 2012-08-10 14:50:24 -04:00
mac.h ath9k: fix interrupt storms on queued hardware reset 2012-08-10 14:50:24 -04:00
main.c ath9k: Implement sta_add_debugfs/sta_remove_debugfs 2012-11-30 13:38:15 -05:00
mci.c ath9k: Fix buffer overflow error 2012-11-30 13:38:14 -05:00
mci.h ath9k: Add new BT profile info A2DP_Voice 2012-10-29 15:19:30 -04:00
pci.c PCI changes for the v3.8 merge window: 2012-12-13 12:14:47 -08:00
phy.h
rc.c ath9k: Fix rate control debugging 2012-11-21 14:16:04 -05:00
rc.h ath9k: Fix rate control debugging 2012-11-21 14:16:04 -05:00
recv.c ath9k: RX timestamp is reported at end of frame 2012-12-11 16:00:38 -05:00
reg.h ath9k_hw: Fix concurrent tx on lower tx power 2012-10-29 15:30:32 -04:00
wmi.c ath: Convert ath_dbg(bar, ATH_DBG_<FOO>, to ath_dbg(bar, FOO 2011-12-19 14:35:31 -05:00
wmi.h
wow.c ath9k_hw: Configure new switch table for AR9565 BTCOEX 2012-10-29 15:19:30 -04:00
xmit.c ath9k: Remove redundant NULL assignment 2012-11-30 13:38:15 -05:00