aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-02-27 22:56:05 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-02-27 22:56:05 +0000
commit7d7118b8bf9d9a7b8a18f2964efd848e1eb5b1f3 (patch)
tree81917bea922a22652a828e33c25bef0e6c0a2b74 /package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
parent340909c73e4944434237418715d6006a95f5b493 (diff)
downloadupstream-7d7118b8bf9d9a7b8a18f2964efd848e1eb5b1f3.tar.gz
upstream-7d7118b8bf9d9a7b8a18f2964efd848e1eb5b1f3.tar.bz2
upstream-7d7118b8bf9d9a7b8a18f2964efd848e1eb5b1f3.zip
mac80211: update to wireless-testing 2012-02-27
SVN-Revision: 30746
Diffstat (limited to 'package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch')
-rw-r--r--package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch14
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 801d53adc9..31e33b7818 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
-@@ -554,6 +554,7 @@ struct rt2x00lib_ops {
+@@ -560,6 +560,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.
-@@ -706,6 +707,7 @@ enum rt2x00_capability_flags {
+@@ -713,6 +714,7 @@ enum rt2x00_capability_flags {
REQUIRE_SW_SEQNO,
REQUIRE_HT_TX_DESC,
REQUIRE_PS_AUTOWAKE,
@@ -117,7 +117,7 @@
/*
* Capabilities
-@@ -960,6 +962,11 @@ struct rt2x00_dev {
+@@ -968,6 +970,11 @@ struct rt2x00_dev {
const struct firmware *fw;
/*
@@ -131,7 +131,7 @@
DECLARE_KFIFO_PTR(txstatus_fifo, u32);
--- a/drivers/net/wireless/rt2x00/rt2x00lib.h
+++ b/drivers/net/wireless/rt2x00/rt2x00lib.h
-@@ -309,6 +309,22 @@ static inline void rt2x00lib_free_firmwa
+@@ -322,6 +322,22 @@ static inline void rt2x00lib_free_firmwa
#endif /* CONFIG_RT2X00_LIB_FIRMWARE */
/*
@@ -229,7 +229,7 @@
* Initialization functions.
*/
static bool rt2800pci_get_entry_state(struct queue_entry *entry)
-@@ -1040,6 +1044,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
-@@ -1157,6 +1157,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de
+@@ -1161,6 +1161,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de
BIT(NL80211_IFTYPE_MESH_POINT) |
BIT(NL80211_IFTYPE_WDS);
@@ -250,7 +250,7 @@
/*
* Initialize work.
*/
-@@ -1280,6 +1284,11 @@ void rt2x00lib_remove_dev(struct rt2x00_
+@@ -1284,6 +1288,11 @@ void rt2x00lib_remove_dev(struct rt2x00_
*/
if (rt2x00dev->drv_data)
kfree(rt2x00dev->drv_data);