diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-09-15 17:55:16 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2011-09-15 17:55:16 +0000 |
commit | 22be36418e2f32eb058e303890bfc680342c377b (patch) | |
tree | 8f29bdde278f2df69be8193bc070a93050de3472 /package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch | |
parent | 98372a8eb51cafa81f0e31672669dc23d745d109 (diff) | |
download | master-31e0f0ae-22be36418e2f32eb058e303890bfc680342c377b.tar.gz master-31e0f0ae-22be36418e2f32eb058e303890bfc680342c377b.tar.bz2 master-31e0f0ae-22be36418e2f32eb058e303890bfc680342c377b.zip |
mac80211: update to wireless-testing 2011-09-14
SVN-Revision: 28245
Diffstat (limited to 'package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch')
-rw-r--r-- | package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch b/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch index 7a84e818f9..e8a9fd45f8 100644 --- a/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch +++ b/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch @@ -101,7 +101,7 @@ +} --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h -@@ -539,6 +539,7 @@ struct rt2x00lib_ops { +@@ -554,6 +554,7 @@ struct rt2x00lib_ops { const u8 *data, const size_t len); int (*load_firmware) (struct rt2x00_dev *rt2x00dev, const u8 *data, const size_t len); @@ -109,7 +109,7 @@ /* * Device initialization/deinitialization handlers. -@@ -685,6 +686,7 @@ enum rt2x00_capability_flags { +@@ -705,6 +706,7 @@ enum rt2x00_capability_flags { REQUIRE_SW_SEQNO, REQUIRE_HT_TX_DESC, REQUIRE_PS_AUTOWAKE, @@ -117,7 +117,7 @@ /* * Capabilities -@@ -940,6 +942,11 @@ struct rt2x00_dev { +@@ -960,6 +962,11 @@ struct rt2x00_dev { const struct firmware *fw; /* @@ -229,7 +229,7 @@ * Initialization functions. */ static bool rt2800pci_get_entry_state(struct queue_entry *entry) -@@ -1050,6 +1054,7 @@ static const struct rt2x00lib_ops rt2800 +@@ -1052,6 +1056,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,7 +239,7 @@ .get_entry_state = rt2800pci_get_entry_state, --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c -@@ -1121,6 +1121,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de +@@ -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); @@ -250,7 +250,7 @@ /* * Let the driver probe the device to detect the capabilities. */ -@@ -1222,6 +1226,11 @@ void rt2x00lib_remove_dev(struct rt2x00_ +@@ -1243,6 +1247,11 @@ void rt2x00lib_remove_dev(struct rt2x00_ * Free queue structures. */ rt2x00queue_free(rt2x00dev); |