linux_dsm_epyc7002/drivers/net/wireless/ath/ath9k
David S. Miller b04096ff33 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Four minor merge conflicts:

1) qca_spi.c renamed the local variable used for the SPI device
   from spi_device to spi, meanwhile the spi_set_drvdata() call
   got moved further up in the probe function.

2) Two changes were both adding new members to codel params
   structure, and thus we had overlapping changes to the
   initializer function.

3) 'net' was making a fix to sk_release_kernel() which is
   completely removed in 'net-next'.

4) In net_namespace.c, the rtnl_net_fill() call for GET operations
   had the command value fixed, meanwhile 'net-next' adjusted the
   argument signature a bit.

This also matches example merge resolutions posted by Stephen
Rothwell over the past two days.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-05-13 14:31:43 -04:00
..
ahb.c ath9k: Add HW IDs for QCA956x 2015-01-15 14:24:57 +02:00
ani.c ath9k: use one shot read in ath9k_hw_update_mibstats 2015-03-30 11:31:31 +03:00
ani.h
antenna.c
ar953x_initvals.h ath9k: Update QCA953x initvals 2015-01-29 10:33:20 +02:00
ar955x_1p0_initvals.h ath9k: Update AR955x initvals 2015-01-29 10:33:21 +02:00
ar956x_initvals.h ath9k: Add initvals for QCA956x 2015-01-15 14:24:59 +02:00
ar5008_initvals.h
ar5008_phy.c ath9k: write buffer related optimisation in ar5008_hw_set_channel_regs 2015-03-30 11:31:33 +03:00
ar9001_initvals.h
ar9002_calib.c ath9k: ar9271_hw_pa_cal: use REG_READ_ARRAY 2015-03-30 11:31:30 +03:00
ar9002_hw.c
ar9002_initvals.h
ar9002_mac.c ath9k: add TPC capability to TX descriptor path 2014-11-25 14:09:56 -05:00
ar9002_phy.c ath9k: For AR9271 chipsets, set count = 0 for endless samples. 2014-11-11 16:31:14 -05:00
ar9002_phy.h
ar9003_2p2_initvals.h
ar9003_aic.c ath9k: Handle MCI_STATE_AIC_CAL 2015-03-20 08:28:11 +02:00
ar9003_aic.h ath9k: Handle MCI_STATE_AIC_CAL 2015-03-20 08:28:11 +02:00
ar9003_buffalo_initvals.h
ar9003_calib.c ath9k: Enable manual peak detect calibration 2015-01-29 10:33:25 +02:00
ar9003_eeprom.c ath9k: Add QCA956x HW support 2015-01-15 14:25:03 +02:00
ar9003_eeprom.h
ar9003_hw.c ath9k: Register private AIC ops 2015-03-20 08:27:17 +02:00
ar9003_mac.c ath9k: add TPC capability to TX descriptor path 2014-11-25 14:09:56 -05:00
ar9003_mac.h
ar9003_mci.c ath9k: Start AIC calibration during MCI reset 2015-03-20 08:28:14 +02:00
ar9003_mci.h ath9k: Fix GPM initialization 2015-03-03 14:55:24 +02:00
ar9003_paprd.c
ar9003_phy.c ath9k: Add QCA956x HW support 2015-01-15 14:25:03 +02:00
ar9003_phy.h ath9k: Add register definitions for AIC 2015-03-20 08:27:19 +02:00
ar9003_rtt.c ath9k: Fix RTT chainmask usage 2015-03-13 15:19:36 +02:00
ar9003_rtt.h ath9k_hw: make support for PC-OEM cards optional 2014-10-27 14:16:18 -04:00
ar9003_wow.c ath9k: Restart TSF2 timers on wakeup 2015-02-26 14:58:46 +02:00
ar9330_1p1_initvals.h
ar9330_1p2_initvals.h
ar9340_initvals.h
ar9462_2p0_initvals.h
ar9462_2p1_initvals.h
ar9485_initvals.h
ar9565_1p0_initvals.h
ar9565_1p1_initvals.h
ar9580_1p0_initvals.h ath9k: Update AR9580 initvals 2014-10-27 14:16:17 -04:00
ath9k.h ath9k: make ath_frame_info fit into reduced-size rate_driver_data 2015-03-13 16:08:56 +02:00
beacon.c ath9k: fix tracking of enabled AP beacons 2015-03-16 08:34:36 +02:00
btcoex.c ath9k: Fix wlan-active gpio for the AR9003 family 2015-03-03 15:46:56 +02:00
btcoex.h ath9k: Handle MCI_STATE_AIC_CAL_SINGLE 2015-03-20 08:27:20 +02:00
calib.c ath9k: ath9k_hw_loadnf: use REG_RMW 2015-03-30 11:31:32 +03:00
calib.h ath9k: restart hardware after noise floor calibration failure 2014-10-27 14:16:18 -04:00
channel.c mac80211: allow drivers to support NL80211_SCAN_FLAG_RANDOM_ADDR 2014-11-19 18:46:09 +01:00
common-beacon.c
common-beacon.h
common-debug.c
common-debug.h
common-init.c
common-init.h
common-spectral.c ath9k: Delete an unnecessary check before the function call "relay_close" 2015-02-06 08:49:22 +02:00
common-spectral.h ath9k: common-spectral: don't depend from ATH9K_DEBUGFS 2014-11-17 15:32:14 -05:00
common.c Merge commit '4e6ce4dc7ce71d0886908d55129d5d6482a27ff9' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2014-11-19 15:38:48 -05:00
common.h ath9k: fix tracking of enabled AP beacons 2015-03-16 08:34:36 +02:00
debug_sta.c
debug.c ath9k: add per-vif TX power capability 2015-03-03 15:36:01 +02:00
debug.h Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
dfs_debug.c
dfs_debug.h
dfs.c ath9k: add DFS support for extension channel 2015-03-16 17:53:07 +02:00
dfs.h
dynack.c ath9k: fix getting tx duration for dynack 2014-09-30 13:17:48 -04:00
dynack.h
eeprom_4k.c ath9k: use REG_RMW and rmw buffer in ath9k_hw_4k_set_board_values 2015-03-30 11:31:40 +03:00
eeprom_9287.c ath9k: add power per-rate tables for AR9002 chips 2015-01-15 14:47:06 +02:00
eeprom_def.c ath9k: use REG_RMW and rmw buffer in ath9k_hw_def_set_gain 2015-03-30 11:31:43 +03:00
eeprom.c ath9k: ath9k_hw_analog_shift_rmw: use REG_RMW 2015-03-30 11:31:37 +03:00
eeprom.h
gpio.c ath9k: add extra GPIO led support 2015-04-07 20:15:01 +03:00
hif_usb.c ath9k_htc: Add new USB ID 2015-02-26 15:20:38 +02:00
hif_usb.h
htc_drv_beacon.c
htc_drv_debug.c wireless: use %*pb[l] to print bitmaps including cpumasks and nodemasks 2015-02-13 21:21:38 -08:00
htc_drv_gpio.c ath9k and ath9k_htc: rename variable "led_blink" 2015-01-27 20:06:27 +02:00
htc_drv_init.c ath9k_htc: add new WMI_REG_RMW_CMDID command 2015-03-30 11:31:18 +03:00
htc_drv_main.c mac80211: remove support for IFF_PROMISC 2015-04-24 11:14:13 +02:00
htc_drv_txrx.c mac80211: remove support for IFF_PROMISC 2015-04-24 11:14:13 +02:00
htc_hst.c ath9k_htc: remove dead code in error path of ath9k_htc_txcompletion_cb 2015-01-23 21:16:02 +02:00
htc_hst.h
htc.h ath9k_htc: add new WMI_REG_RMW_CMDID command 2015-03-30 11:31:18 +03:00
hw-ops.h ath9k: Register private AIC ops 2015-03-20 08:27:17 +02:00
hw.c ath9k: add extra GPIO led support 2015-04-07 20:15:01 +03:00
hw.h ath9k: add extra GPIO led support 2015-04-07 20:15:01 +03:00
init.c ath9k: add multi_read to be compatible with ath9k_htc 2015-03-30 11:31:27 +03:00
Kconfig ath9k_common: make sure DEBUG_FS and RELAY enabled 2014-11-19 15:50:04 -05:00
link.c cfg80211: remove "channel" from survey names 2015-01-08 15:27:52 +01:00
mac.c ath9k: Add QCA956x HW support 2015-01-15 14:25:03 +02:00
mac.h ath9k: add TPC capability to TX descriptor path 2014-11-25 14:09:56 -05:00
main.c mac80211: remove support for IFF_PROMISC 2015-04-24 11:14:13 +02:00
Makefile ath9k: Register private AIC ops 2015-03-20 08:27:17 +02:00
mci.c ath9k: Fix GPM initialization 2015-03-03 14:55:24 +02:00
mci.h
pci.c ath9k: Check WOW triggers properly 2015-02-03 15:31:04 +02:00
phy.h
recv.c mac80211: remove support for IFF_PROMISC 2015-04-24 11:14:13 +02:00
reg_aic.h ath9k: Add register definitions for AIC 2015-03-20 08:27:19 +02:00
reg_mci.h ath9k: Mute BT properly 2015-03-03 14:55:27 +02:00
reg_wow.h ath9k: Clear additional WoW events 2015-02-26 14:58:43 +02:00
reg.h ath9k: add extra GPIO led support 2015-04-07 20:15:01 +03:00
tx99.c ath9k: Unify reset API 2014-10-27 14:16:14 -04:00
wmi.c ath9k_htc: check seq number instead of cmd id for timeout 2015-04-07 20:07:44 +03:00
wmi.h ath9k_htc: check seq number instead of cmd id for timeout 2015-04-07 20:07:44 +03:00
wow.c ath9k: Register correct WOW details with mac80211 2015-02-06 08:39:21 +02:00
xmit.c ath9k: fix per-packet tx power configuration 2015-05-03 23:54:38 +03:00