Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4dd35640 authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k: Identify Killer Wireless cards 



Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 96581132

drivers/net/wireless/ath/ath9k/ath9k.h

+1 −0
Original line number Diff line number Diff line
@@ -642,6 +642,7 @@ void ath_ant_comb_scan(struct ath_softc *sc, struct ath_rx_status *rs); 
#define ATH9K_PCI_AR9565_1ANT     0x0080

#define ATH9K_PCI_AR9565_2ANT     0x0100

#define ATH9K_PCI_NO_PLL_PWRSAVE  0x0200

#define ATH9K_PCI_KILLER          0x0400



/*

 * Default cache line size, in bytes.

drivers/net/wireless/ath/ath9k/init.c

+3 −0
Original line number Diff line number Diff line
@@ -589,6 +589,9 @@ static void ath9k_init_platform(struct ath_softc *sc) 
	if (sc->driver_data & ATH9K_PCI_AR9565_2ANT)

		ath_info(common, "WB335 2-ANT card detected\n");



	if (sc->driver_data & ATH9K_PCI_KILLER)

		ath_info(common, "Killer Wireless card detected\n");



	/*

	 * Some WB335 cards do not support antenna diversity. Since

	 * we use a hardcoded value for AR9565 instead of using the

drivers/net/wireless/ath/ath9k/pci.c

+20 −0
Original line number Diff line number Diff line
@@ -87,6 +87,19 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = { 
	{ PCI_VDEVICE(ATHEROS, 0x002C) }, /* PCI-E 802.11n bonded out */

	{ PCI_VDEVICE(ATHEROS, 0x002D) }, /* PCI   */

	{ PCI_VDEVICE(ATHEROS, 0x002E) }, /* PCI-E */



	/* Killer Wireless (3x3) */

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0030,

			 0x1A56,

			 0x2000),

	  .driver_data = ATH9K_PCI_KILLER },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0030,

			 0x1A56,

			 0x2001),

	  .driver_data = ATH9K_PCI_KILLER },



	{ PCI_VDEVICE(ATHEROS, 0x0030) }, /* PCI-E  AR9300 */



	/* PCI-E CUS198 */
@@ -354,6 +367,13 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = { 
			 0x1783),

	  .driver_data = ATH9K_PCI_WOW },



	/* Killer Wireless (2x2) */

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0030,

			 0x1A56,

			 0x2003),

	  .driver_data = ATH9K_PCI_KILLER },



	{ PCI_VDEVICE(ATHEROS, 0x0034) }, /* PCI-E  AR9462 */

	{ PCI_VDEVICE(ATHEROS, 0x0037) }, /* PCI-E  AR1111/AR9485 */