diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-06-18 01:26:36 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2012-06-18 01:26:36 +0000 |
commit | 33600679329458db7a0d258f3985daa52d98bf75 (patch) | |
tree | 9c5f6766d736f534cb39faa25b00a9b126d26f94 /package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch | |
parent | c73b39fd302245a47813d1a41a082df7b82c45fb (diff) | |
download | mtk-20170518-33600679329458db7a0d258f3985daa52d98bf75.zip mtk-20170518-33600679329458db7a0d258f3985daa52d98bf75.tar.gz mtk-20170518-33600679329458db7a0d258f3985daa52d98bf75.tar.bz2 |
mac80211: update to wireless-testing 2012-06-14
SVN-Revision: 32420
Diffstat (limited to 'package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch')
-rw-r--r-- | package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch b/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch index eca2edf..abfd41b 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 -@@ -560,6 +560,7 @@ struct rt2x00lib_ops { +@@ -559,6 +559,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. -@@ -721,6 +722,7 @@ enum rt2x00_capability_flags { +@@ -720,6 +721,7 @@ enum rt2x00_capability_flags { REQUIRE_SW_SEQNO, REQUIRE_HT_TX_DESC, REQUIRE_PS_AUTOWAKE, @@ -117,7 +117,7 @@ /* * Capabilities -@@ -976,6 +978,11 @@ struct rt2x00_dev { +@@ -975,6 +977,11 @@ struct rt2x00_dev { const struct firmware *fw; /* @@ -239,9 +239,9 @@ .get_entry_state = rt2800pci_get_entry_state, --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c -@@ -1161,6 +1161,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de - BIT(NL80211_IFTYPE_MESH_POINT) | - BIT(NL80211_IFTYPE_WDS); +@@ -1163,6 +1163,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de + + rt2x00dev->hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN; + retval = rt2x00lib_load_eeprom_file(rt2x00dev); + if (retval) @@ -250,7 +250,7 @@ /* * Initialize work. */ -@@ -1285,6 +1289,11 @@ void rt2x00lib_remove_dev(struct rt2x00_ +@@ -1287,6 +1291,11 @@ void rt2x00lib_remove_dev(struct rt2x00_ */ if (rt2x00dev->drv_data) kfree(rt2x00dev->drv_data); |