X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/4669033c1418465423dd5ee5410224161801525d..d0abad5f540fe40db93d605e122e430c65f0bbbf:/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch?ds=sidebyside

diff --git a/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch b/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
index e8a9fd45f..d15b07da5 100644
--- a/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
+++ b/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
@@ -117,7 +117,7 @@
  
  	/*
  	 * Capabilities
-@@ -960,6 +962,11 @@ struct rt2x00_dev {
+@@ -961,6 +963,11 @@ struct rt2x00_dev {
  	const struct firmware *fw;
  
  	/*
@@ -229,7 +229,7 @@
   * Initialization functions.
   */
  static bool rt2800pci_get_entry_state(struct queue_entry *entry)
-@@ -1052,6 +1056,7 @@ static const struct rt2x00lib_ops rt2800
+@@ -1040,6 +1044,7 @@ static const struct rt2x00lib_ops rt2800
  	.get_firmware_name	= rt2800pci_get_firmware_name,
  	.check_firmware		= rt2800_check_firmware,
  	.load_firmware		= rt2800_load_firmware,
@@ -239,18 +239,18 @@
  	.get_entry_state	= rt2800pci_get_entry_state,
 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c
 +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
-@@ -1142,6 +1142,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de
- 	INIT_WORK(&rt2x00dev->intf_work, rt2x00lib_intf_scheduled);
- 	INIT_DELAYED_WORK(&rt2x00dev->autowakeup_work, rt2x00lib_autowakeup);
+@@ -1145,6 +1145,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de
+ 		    BIT(NL80211_IFTYPE_MESH_POINT) |
+ 		    BIT(NL80211_IFTYPE_WDS);
  
 +	retval = rt2x00lib_load_eeprom_file(rt2x00dev);
 +	if (retval)
 +		goto exit;
 +
  	/*
- 	 * Let the driver probe the device to detect the capabilities.
+ 	 * Initialize work.
  	 */
-@@ -1243,6 +1247,11 @@ void rt2x00lib_remove_dev(struct rt2x00_
+@@ -1261,6 +1265,11 @@ void rt2x00lib_remove_dev(struct rt2x00_
  	 * Free queue structures.
  	 */
  	rt2x00queue_free(rt2x00dev);