Commit 2abcd3d4 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2015-12-01' of... 

Merge tag 'iwlwifi-next-for-kalle-2015-12-01' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

* BT coex improvements (Avri, Moshe)
* D3 operation bugfixes (Luca, Eliad)
* Rate control improvements (Eyal)
* Firmware debugging infra improvements (Golan)
* Ground work for multi Rx (Johannes)
* Various security fixes (Johannes)
parents f1b4b511 86355816

drivers/net/wireless/intel/iwlwifi/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -53,7 +53,7 @@ config IWLWIFI_LEDS 




config IWLDVM

config IWLDVM

	tristate "Intel Wireless WiFi DVM Firmware support"

	tristate "Intel Wireless WiFi DVM Firmware support"

	default IWLWIFI

	depends on m

	help

	help

	  This is the driver that supports the DVM firmware. The list

	  This is the driver that supports the DVM firmware. The list

	  of the devices that use this firmware is available here:

	  of the devices that use this firmware is available here:

drivers/net/wireless/intel/iwlwifi/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -8,7 +8,7 @@ iwlwifi-objs += iwl-eeprom-read.o iwl-eeprom-parse.o 
iwlwifi-objs		+= iwl-phy-db.o iwl-nvm-parse.o

iwlwifi-objs		+= iwl-phy-db.o iwl-nvm-parse.o

iwlwifi-objs		+= pcie/drv.o pcie/rx.o pcie/tx.o pcie/trans.o

iwlwifi-objs		+= pcie/drv.o pcie/rx.o pcie/tx.o pcie/trans.o

iwlwifi-$(CONFIG_IWLDVM) += iwl-1000.o iwl-2000.o iwl-5000.o iwl-6000.o

iwlwifi-$(CONFIG_IWLDVM) += iwl-1000.o iwl-2000.o iwl-5000.o iwl-6000.o

iwlwifi-$(CONFIG_IWLMVM) += iwl-7000.o iwl-8000.o

iwlwifi-$(CONFIG_IWLMVM) += iwl-7000.o iwl-8000.o iwl-9000.o

iwlwifi-objs		+= iwl-trans.o

iwlwifi-objs		+= iwl-trans.o





iwlwifi-objs += $(iwlwifi-m)

iwlwifi-objs += $(iwlwifi-m)

drivers/net/wireless/intel/iwlwifi/dvm/calib.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ 
 * in the file called COPYING.

 * in the file called COPYING.

 *

 *

 * Contact Information:

 * Contact Information:

 *  Intel Linux Wireless <ilw@linux.intel.com>

 *  Intel Linux Wireless <linuxwifi@intel.com>

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 *

 *

 * BSD LICENSE

 * BSD LICENSE

drivers/net/wireless/intel/iwlwifi/dvm/calib.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ 
 * in the file called COPYING.

 * in the file called COPYING.

 *

 *

 * Contact Information:

 * Contact Information:

 *  Intel Linux Wireless <ilw@linux.intel.com>

 *  Intel Linux Wireless <linuxwifi@intel.com>

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 *

 *

 * BSD LICENSE

 * BSD LICENSE

drivers/net/wireless/intel/iwlwifi/dvm/commands.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ 
 * in the file called COPYING.

 * in the file called COPYING.

 *

 *

 * Contact Information:

 * Contact Information:

 *  Intel Linux Wireless <ilw@linux.intel.com>

 *  Intel Linux Wireless <linuxwifi@intel.com>

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 *

 *

 * BSD LICENSE

 * BSD LICENSE

CRA Git | Maintained and supported by SUSTech CRA and CCSE