From 5d0a19a2c169ab51a05573fbacc905a191b24858 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Mon, 19 Sep 2011 11:49:21 -0700 Subject: [PATCH] compat-wireless: fix multiqueue patch 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 --- patches/22-multiqueue.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/22-multiqueue.patch b/patches/22-multiqueue.patch index ef8a6e863f03..1fbf0aa26d1a 100644 --- a/patches/22-multiqueue.patch +++ b/patches/22-multiqueue.patch @@ -96,7 +96,7 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb() --- 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; } @@ -104,10 +104,10 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb() + /* 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) -- 2.30.2