OpenCloudOS-Kernel/drivers/net/wireless/iwlwifi
Johannes Berg d107babca2 iwlwifi: pcie: fix merge damage
The merge b35c8097 seems to have lost commit eabc4ac5d,
put the code back.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2013-10-07 13:34:43 -04:00
..
dvm Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2013-08-28 10:36:09 -04:00
mvm iwlwifi: mvm: call ieee80211_scan_completed when needed 2013-10-02 11:25:50 +02:00
pcie iwlwifi: pcie: fix merge damage 2013-10-07 13:34:43 -04:00
Kconfig iwlwifi: Kconfig: fix help texts wrt 7260 and 3160 devices 2013-08-16 12:11:47 +02:00
Makefile iwlwifi: remove testmode 2013-06-18 11:51:57 +02:00
iwl-1000.c iwlwifi: move some configuration parameters into DVM 2013-05-27 13:11:42 +02:00
iwl-2000.c iwlwifi: move some configuration parameters into DVM 2013-05-27 13:11:42 +02:00
iwl-5000.c iwlwifi: move some configuration parameters into DVM 2013-05-27 13:11:42 +02:00
iwl-6000.c iwlwifi: pcie: add SKUs for 6000, 6005 and 6235 series 2013-10-02 11:25:38 +02:00
iwl-7000.c iwlwifi: mvm: add high temperature SKU thermal throttling parameters 2013-07-31 11:05:07 +02:00
iwl-agn-hw.h iwlwifi: a few fixes in license 2013-03-06 16:46:59 +01:00
iwl-config.h iwlwifi: pcie: add SKUs for 6000, 6005 and 6235 series 2013-10-02 11:25:38 +02:00
iwl-csr.h iwlwifi: mvm: add thermal throttling and CT kill 2013-05-29 09:03:18 +02:00
iwl-debug.c iwlwifi: export symbols only conditionally 2013-03-06 16:47:56 +01:00
iwl-debug.h iwlwifi: introduce external debug level 2013-08-09 14:37:33 +02:00
iwl-devtrace.c iwlwifi: update copyright 2013-01-24 13:00:55 +01:00
iwl-devtrace.h mac80211: add control port protocol TX control flag 2013-08-12 14:09:29 +02:00
iwl-drv.c iwlwifi: return -ENOMEM instead of NULL when OOM in iwl_drv_start() 2013-08-16 12:12:03 +02:00
iwl-drv.h iwlwifi: include export.h instead of module.h 2013-06-11 20:16:26 +02:00
iwl-eeprom-parse.c iwlwifi: take valid ant for HT caps from TLV 2013-05-29 09:03:23 +02:00
iwl-eeprom-parse.h iwlwifi: take valid ant for HT caps from TLV 2013-05-29 09:03:23 +02:00
iwl-eeprom-read.c iwlwifi: export symbols only conditionally 2013-03-06 16:47:56 +01:00
iwl-eeprom-read.h iwlwifi: a few fixes in license 2013-03-06 16:46:59 +01:00
iwl-fh.h iwlwifi: a few fixes in license 2013-03-06 16:46:59 +01:00
iwl-fw-file.h iwlwifi: a few fixes in license 2013-03-06 16:46:59 +01:00
iwl-fw.h iwlwifi: use a macro for default probe length 2013-08-16 12:11:36 +02:00
iwl-io.c iwlwifi: move dump_fh into common code 2013-07-16 13:12:54 +03:00
iwl-io.h iwlwifi: move dump_fh into common code 2013-07-16 13:12:54 +03:00
iwl-modparams.h iwlwifi: remove auto_agg module parameter 2013-06-18 11:51:56 +02:00
iwl-notif-wait.c iwlwifi: export symbols only conditionally 2013-03-06 16:47:56 +01:00
iwl-notif-wait.h iwlwifi: a few fixes in license 2013-03-06 16:46:59 +01:00
iwl-nvm-parse.c iwlwifi: mvm: Enable user set TX power 2013-07-31 11:04:59 +02:00
iwl-nvm-parse.h iwlwifi: take valid ant for HT caps from TLV 2013-05-29 09:03:23 +02:00
iwl-op-mode.h iwlwifi: fix some documentation typos 2013-08-06 10:33:58 +02:00
iwl-phy-db.c iwlwifi: remove calib channel section from PHY DB 2013-06-13 12:03:52 +02:00
iwl-phy-db.h iwlwifi: a few fixes in license 2013-03-06 16:46:59 +01:00
iwl-prph.h Revert "iwlwifi: pcie: clear RFKILL interrupt in AMPG" 2013-08-06 10:28:54 +02:00
iwl-trans.h iwlwifi: don't WARN on host commands sent when firmware is dead 2013-10-02 11:25:38 +02:00