mac80211: update to backports-4.14-rc2

[openwrt/staging/lynxis.git] / package / kernel / mac80211 / patches / 513-ath9k_add_pci_ids.patch

diff --git a/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch b/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch
index 806865052fae86ac74115972f68f9cb43fd9289b..fdeaed05e8de3b954c302cf43cc27a36b41d5f4c 100644 (file)
--- a/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch
+++ b/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch
@@ -1,16 +1,16 @@
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -518,6 +518,7 @@ static int __ath9k_hw_init(struct ath_hw
-       ath9k_hw_read_revisions(ah);
+@@ -647,6 +647,7 @@ int ath9k_hw_init(struct ath_hw *ah)
  
-       switch (ah->hw_version.macVersion) {
+       /* These are all the AR5008/AR9001/AR9002/AR9003 hardware family of chipsets */
+       switch (ah->hw_version.devid) {
 +      case AR9300_DEVID_INVALID:
-       case AR_SREV_VERSION_5416_PCI:
-       case AR_SREV_VERSION_5416_PCIE:
-       case AR_SREV_VERSION_9160:
+       case AR5416_DEVID_PCI:
+       case AR5416_DEVID_PCIE:
+       case AR5416_AR9100_DEVID:
 --- a/drivers/net/wireless/ath/ath9k/hw.h
 +++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -34,6 +34,7 @@
+@@ -36,6 +36,7 @@
  
  #define ATHEROS_VENDOR_ID     0x168c
  
@@ -20,9 +20,9 @@
  #define AR9160_DEVID_PCI      0x0027
 --- a/drivers/net/wireless/ath/ath9k/pci.c
 +++ b/drivers/net/wireless/ath/ath9k/pci.c
-@@ -658,6 +658,7 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_i
-       { PCI_VDEVICE(ATHEROS, 0x0036),
+@@ -773,6 +773,7 @@ static const struct pci_device_id ath_pc
          .driver_data = ATH9K_PCI_BT_ANT_DIV },
+ #endif
  
 +      { PCI_VDEVICE(ATHEROS, 0xabcd) }, /* PCI-E  internal chip default ID */
        { 0 }