diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-11-18 11:27:19 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-11-18 11:27:19 +0000 |
| commit | 0838e883f23dccd17ce752b698ac26c2a625e4e4 (patch) | |
| tree | be58d124bb1e584129c21e071c44c3be85eed09d /package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch | |
| parent | ae90aa4efd1efff1a4f02e9993dc6bd6393a8dc2 (diff) | |
| download | upstream-0838e883f23dccd17ce752b698ac26c2a625e4e4.tar.gz upstream-0838e883f23dccd17ce752b698ac26c2a625e4e4.tar.bz2 upstream-0838e883f23dccd17ce752b698ac26c2a625e4e4.zip | |
mac80211: update to wireless-testing 2011-11-15
SVN-Revision: 29240
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 e8a9fd45f8..0fb42f9fed 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; /* @@ -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); |