aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/ath/431-add_platform_eeprom_support_to_ath5k.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2019-10-01 23:28:36 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2019-10-19 12:35:55 +0200
commite6cadb215cba051464eaeba8040d8c82d524b088 (patch)
treeaf1d20d6c2168dda699b1a4de622acb848fe21fc /package/kernel/mac80211/patches/ath/431-add_platform_eeprom_support_to_ath5k.patch
parent67dc023f87699e56457a3ba4a97da60605042bd7 (diff)
downloadupstream-e6cadb215cba051464eaeba8040d8c82d524b088.tar.gz
upstream-e6cadb215cba051464eaeba8040d8c82d524b088.tar.bz2
upstream-e6cadb215cba051464eaeba8040d8c82d524b088.zip
mac80211: Update to version 5.4-rc2
This updates mac80211 to backports based on kernel 5.4-rc2 ath10k-ct was updated to match the API changes and iw now uses the new nl80211.h header file. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/kernel/mac80211/patches/ath/431-add_platform_eeprom_support_to_ath5k.patch')
-rw-r--r--package/kernel/mac80211/patches/ath/431-add_platform_eeprom_support_to_ath5k.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/package/kernel/mac80211/patches/ath/431-add_platform_eeprom_support_to_ath5k.patch b/package/kernel/mac80211/patches/ath/431-add_platform_eeprom_support_to_ath5k.patch
index cdc9315cd6..136be19894 100644
--- a/package/kernel/mac80211/patches/ath/431-add_platform_eeprom_support_to_ath5k.patch
+++ b/package/kernel/mac80211/patches/ath/431-add_platform_eeprom_support_to_ath5k.patch
@@ -1,14 +1,14 @@
--- a/drivers/net/wireless/ath/ath5k/pci.c
+++ b/drivers/net/wireless/ath/ath5k/pci.c
-@@ -21,6 +21,7 @@
- #include <linux/pci-aspm.h>
+@@ -20,6 +20,7 @@
+ #include <linux/pci.h>
#include <linux/etherdevice.h>
#include <linux/module.h>
+#include <linux/ath5k_platform.h>
#include "../ath.h"
#include "ath5k.h"
#include "debug.h"
-@@ -72,7 +73,7 @@ static void ath5k_pci_read_cachesize(str
+@@ -71,7 +72,7 @@ static void ath5k_pci_read_cachesize(str
}
/*
@@ -17,7 +17,7 @@
*/
static bool
ath5k_pci_eeprom_read(struct ath_common *common, u32 offset, u16 *data)
-@@ -80,6 +81,19 @@ ath5k_pci_eeprom_read(struct ath_common
+@@ -79,6 +80,19 @@ ath5k_pci_eeprom_read(struct ath_common
struct ath5k_hw *ah = (struct ath5k_hw *) common->ah;
u32 status, timeout;
@@ -37,7 +37,7 @@
/*
* Initialize EEPROM access
*/
-@@ -123,6 +137,16 @@ static int ath5k_pci_eeprom_read_mac(str
+@@ -122,6 +136,16 @@ static int ath5k_pci_eeprom_read_mac(str
u16 data;
int octet;