a8f63a0717
This updates mac80211 to backprots-4.14-rc2. This was compile and runtime tested with ath9k, ath10k and b43 with multiple stations and ieee80211w and in different scenarios by many other people. To create the backports-4.14-rc2-1.tar.xz use this repository: https://git.kernel.org/pub/scm/linux/kernel/git/backports/backports.git from tag v4.14-rc2-1 Then run this: ./gentree.py --git-revision v4.14-rc2 --clean <path to linux repo> ../backports-4.14-rc2-1 This also adapts the ath10k-ct and mt76 driver to the changed cfg80211 APIs and syncs the nl80211.h file in iw with the new version from backports-4.14-rc2. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
30 lines
932 B
Diff
30 lines
932 B
Diff
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
|
@@ -647,6 +647,7 @@ int ath9k_hw_init(struct ath_hw *ah)
|
|
|
|
/* These are all the AR5008/AR9001/AR9002/AR9003 hardware family of chipsets */
|
|
switch (ah->hw_version.devid) {
|
|
+ case AR9300_DEVID_INVALID:
|
|
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
|
|
@@ -36,6 +36,7 @@
|
|
|
|
#define ATHEROS_VENDOR_ID 0x168c
|
|
|
|
+#define AR9300_DEVID_INVALID 0xabcd
|
|
#define AR5416_DEVID_PCI 0x0023
|
|
#define AR5416_DEVID_PCIE 0x0024
|
|
#define AR9160_DEVID_PCI 0x0027
|
|
--- a/drivers/net/wireless/ath/ath9k/pci.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/pci.c
|
|
@@ -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 }
|
|
};
|
|
|