diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-02-27 16:23:43 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-02-27 16:23:43 +0000 |
| commit | e3ec30cad1a857b0aa20122187eb0788c8cfe50c (patch) | |
| tree | 16c52de3fb93e328610483a43b8aa40f5c916383 /package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch | |
| parent | 8ad6213f599436363534327a005eaac024bc08db (diff) | |
| download | upstream-e3ec30cad1a857b0aa20122187eb0788c8cfe50c.tar.gz upstream-e3ec30cad1a857b0aa20122187eb0788c8cfe50c.tar.bz2 upstream-e3ec30cad1a857b0aa20122187eb0788c8cfe50c.zip | |
mac80211: update to wireless-testing 2012-02-23
SVN-Revision: 30742
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 d15b07da5c..801d53adc9 100644 --- a/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch +++ b/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch @@ -109,7 +109,7 @@ /* * Device initialization/deinitialization handlers. -@@ -705,6 +706,7 @@ enum rt2x00_capability_flags { +@@ -706,6 +707,7 @@ enum rt2x00_capability_flags { REQUIRE_SW_SEQNO, REQUIRE_HT_TX_DESC, REQUIRE_PS_AUTOWAKE, @@ -117,7 +117,7 @@ /* * Capabilities -@@ -961,6 +963,11 @@ struct rt2x00_dev { +@@ -960,6 +962,11 @@ struct rt2x00_dev { const struct firmware *fw; /* @@ -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 -@@ -1145,6 +1145,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de +@@ -1157,6 +1157,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de BIT(NL80211_IFTYPE_MESH_POINT) | BIT(NL80211_IFTYPE_WDS); @@ -250,10 +250,10 @@ /* * Initialize work. */ -@@ -1261,6 +1265,11 @@ void rt2x00lib_remove_dev(struct rt2x00_ - * Free queue structures. +@@ -1280,6 +1284,11 @@ void rt2x00lib_remove_dev(struct rt2x00_ */ - rt2x00queue_free(rt2x00dev); + if (rt2x00dev->drv_data) + kfree(rt2x00dev->drv_data); + + /* + * Free EEPROM image. |