summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d95cf13)
raw | patch | inline | side by side (parent: d95cf13)
author | Luis R. Rodriguez <mcgrof@qca.qualcomm.com> | |
Mon, 19 Sep 2011 18:49:21 +0000 (11:49 -0700) | ||
committer | Luis R. Rodriguez <mcgrof@qca.qualcomm.com> | |
Mon, 19 Sep 2011 18:49:21 +0000 (11:49 -0700) |
One offset was no longer in proper context, this required
manual intervention. I'm going to start annotating these for
record keeping purposes with this notation:
Manual-patch-fix
Signed-off-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
manual intervention. I'm going to start annotating these for
record keeping purposes with this notation:
Manual-patch-fix
Signed-off-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
patches/22-multiqueue.patch | patch | blob | history |
index ef8a6e863f038848e89a1597f6d2e8f7a14fe48d..1fbf0aa26d1abff759d142d8ca08a4d3ccf35227 100644 (file)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
-@@ -1595,6 +1595,10 @@ static void ieee80211_xmit(struct ieee80
+@@ -1596,6 +1596,10 @@ static void ieee80211_xmit(struct ieee80
return;
}
+ /* Older kernels do not have the select_queue callback */
+ skb_set_queue_mapping(skb, ieee80211_select_queue(sdata, skb));
+#endif
- ieee80211_set_qos_hdr(local, skb);
+ ieee80211_set_qos_hdr(sdata, skb);
ieee80211_tx(sdata, skb, false);
rcu_read_unlock();
-@@ -2108,7 +2112,14 @@ void ieee80211_tx_pending(unsigned long
+@@ -2113,7 +2117,14 @@ void ieee80211_tx_pending(unsigned long
if (skb_queue_empty(&local->pending[i]))
list_for_each_entry_rcu(sdata, &local->interfaces, list)