diff --git a/package/kernel/mac80211/patches/rt2x00/602-01-wifi-rt2x00-Add-support-for-loading-EEPROM-from-user.patch b/package/kernel/mac80211/patches/rt2x00/602-01-wifi-rt2x00-Add-support-for-loading-EEPROM-from-user.patch index f3c8ddd4f65..cc3aa566185 100644 --- a/package/kernel/mac80211/patches/rt2x00/602-01-wifi-rt2x00-Add-support-for-loading-EEPROM-from-user.patch +++ b/package/kernel/mac80211/patches/rt2x00/602-01-wifi-rt2x00-Add-support-for-loading-EEPROM-from-user.patch @@ -108,6 +108,20 @@ Signed-off-by: Christian Marangi /* * Capabilities +@@ -1505,4 +1506,13 @@ void rt2x00lib_remove_dev(struct rt2x00_ + int rt2x00lib_suspend(struct rt2x00_dev *rt2x00dev); + int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev); + ++/* ++ * EEPROM file handlers. ++ */ ++#ifdef CPTCFG_RT2X00_LIB_EEPROM ++int rt2x00lib_read_eeprom(struct rt2x00_dev *rt2x00dev); ++#else ++#define rt2x00lib_read_eeprom NULL ++#endif /* CPTCFG_RT2X00_LIB_EEPROM */ ++ + #endif /* RT2X00_H */ --- /dev/null +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00eeprom.c @@ -0,0 +1,77 @@ @@ -210,19 +224,3 @@ Signed-off-by: Christian Marangi if (rt2800pci_efuse_detect(rt2x00dev)) retval = rt2800pci_read_eeprom_efuse(rt2x00dev); else ---- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h -+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h -@@ -270,4 +270,13 @@ void rt2800_get_txwi_rxwi_size(struct rt - unsigned short *rxwi_size); - void rt2800_pre_reset_hw(struct rt2x00_dev *rt2x00dev); - -+/* -+ * EEPROM file handlers. -+ */ -+#ifdef CPTCFG_RT2X00_LIB_EEPROM -+int rt2x00lib_read_eeprom(struct rt2x00_dev *rt2x00dev); -+#else -+#define rt2x00lib_read_eeprom NULL -+#endif /* CPTCFG_RT2X00_LIB_EEPROM */ -+ - #endif /* RT2800LIB_H */ diff --git a/package/kernel/mac80211/patches/rt2x00/994-rt2x00-import-support-for-external-LNA-on-MT7620.patch b/package/kernel/mac80211/patches/rt2x00/994-rt2x00-import-support-for-external-LNA-on-MT7620.patch index 88a72fd03ec..a92de135948 100644 --- a/package/kernel/mac80211/patches/rt2x00/994-rt2x00-import-support-for-external-LNA-on-MT7620.patch +++ b/package/kernel/mac80211/patches/rt2x00/994-rt2x00-import-support-for-external-LNA-on-MT7620.patch @@ -31,7 +31,7 @@ Signed-off-by: Daniel Golle mutex_unlock(&rt2x00dev->csr_mutex); } -+void rt6352_enable_pa_pin(struct rt2x00_dev *rt2x00dev, int enable) ++static void rt6352_enable_pa_pin(struct rt2x00_dev *rt2x00dev, int enable) +{ + if (!rt2x00dev->pinctrl) + return;