mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-23 22:34:04 +02:00
[package] mac80211: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33557 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
237dcc5119
commit
b20bdba44f
@ -281,6 +281,13 @@
|
||||
+ list_for_each_entry_rcu(sdata, &local->interfaces, list) {
|
||||
+ if (!sdata->dev)
|
||||
+ continue;
|
||||
+
|
||||
+ if (skb->dev != sdata->dev)
|
||||
+ continue;
|
||||
+
|
||||
+ found = true;
|
||||
+ break;
|
||||
+ }
|
||||
|
||||
- p2p_sdata = rcu_dereference(local->p2p_sdata);
|
||||
- if (p2p_sdata) {
|
||||
@ -289,18 +296,11 @@
|
||||
- skb->len, acked, GFP_ATOMIC);
|
||||
- }
|
||||
- rcu_read_unlock();
|
||||
+ if (skb->dev != sdata->dev)
|
||||
+ continue;
|
||||
+
|
||||
+ found = true;
|
||||
+ break;
|
||||
}
|
||||
+
|
||||
+ if (!skb->dev) {
|
||||
+ sdata = rcu_dereference(local->p2p_sdata);
|
||||
+ if (sdata)
|
||||
+ found = true;
|
||||
+ }
|
||||
}
|
||||
+
|
||||
+ if (!found)
|
||||
+ skb->dev = NULL;
|
||||
|
@ -198,12 +198,12 @@
|
||||
- memcpy_fromio(rt2x00dev->eeprom, base_addr, EEPROM_SIZE);
|
||||
-
|
||||
- iounmap(base_addr);
|
||||
+ memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE);
|
||||
}
|
||||
-}
|
||||
-#else
|
||||
-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 */
|
||||
|
||||
#ifdef CONFIG_PCI
|
||||
|
Loading…
Reference in New Issue
Block a user