ath9k: fix handling of the default chip pci id on ar93xx (#14886)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39432 3c298f89-4303-0410-b956-a3cf2f4a3e73

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 8068650..db4e6a1 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,13 +1,13 @@
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
 --- 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);
+@@ -614,6 +614,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 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 @@
 --- a/drivers/net/wireless/ath/ath9k/hw.h
 +++ b/drivers/net/wireless/ath/ath9k/hw.h
 @@ -34,6 +34,7 @@