qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 17:55:55 +02:00
Code

[package] mac80211: refresh patches

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33557 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2012-09-26 12:53:54 +00:00
parent 237dcc5119
commit b20bdba44f
14 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
package/mac80211/patches/300-pending_work.patch
View File

@ -281,6 +281,13 @@
+ list_for_each_entry_rcu(sdata, &local->interfaces, list) { + list_for_each_entry_rcu(sdata, &local->interfaces, list) {
+ if (!sdata->dev) + if (!sdata->dev)
+ continue; + continue;
+
+ if (skb->dev != sdata->dev)
+ continue;
+
+ found = true;
+ break;
+ }
- p2p_sdata = rcu_dereference(local->p2p_sdata); - p2p_sdata = rcu_dereference(local->p2p_sdata);
- if (p2p_sdata) { - if (p2p_sdata) {
@ -289,18 +296,11 @@
- skb->len, acked, GFP_ATOMIC); - skb->len, acked, GFP_ATOMIC);
- } - }
- rcu_read_unlock(); - rcu_read_unlock();
+ if (skb->dev != sdata->dev)
+ continue;
+
+ found = true;
+ break;
}
+
+ if (!skb->dev) { + if (!skb->dev) {
+ sdata = rcu_dereference(local->p2p_sdata); + sdata = rcu_dereference(local->p2p_sdata);
+ if (sdata) + if (sdata)
+ found = true; + found = true;
+ } }
+ +
+ if (!found) + if (!found)
+ skb->dev = NULL; + skb->dev = NULL;

6
package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
View File

@ -198,12 +198,12 @@
- memcpy_fromio(rt2x00dev->eeprom, base_addr, EEPROM_SIZE); - memcpy_fromio(rt2x00dev->eeprom, base_addr, EEPROM_SIZE);
- -
- iounmap(base_addr); - iounmap(base_addr);
+ memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE); -}
}
-#else -#else
-static inline void rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev) -static inline void rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev)
-{ -{
-} + memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE);
}
-#endif /* CONFIG_RALINK_RT288X || CONFIG_RALINK_RT305X */ -#endif /* CONFIG_RALINK_RT288X || CONFIG_RALINK_RT305X */
#ifdef CONFIG_PCI #ifdef CONFIG_PCI