compat-wireless: update 22-multiqueue.patch for the current linux-next
PATCH 1/1 compat-wireless: update 22-multiqueue.patch for the current linux-next
Adjust for spacing change in net/mac80211/util.c. Add a replacement for netif_tx_wake_queue() for net/mac80211/tx.c
---
0 files changed, 0 insertions(+), 0 deletions(-)
patches/22-multiqueue.patch +27 -11
@@ -65,21 +65,21 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb() static void __ieee80211_wake_queue(struct ieee80211_hw *hw, int queue, enum queue_stop_reason reason) { -@@ -286,7 +298,14 @@ static void __ieee80211_wake_queue(struc - - rcu_read_lock(); - list_for_each_entry_rcu(sdata, &local->interfaces, list) +@@ -284,7 +296,14 @@ static void __ieee80211_wake_queue(struc + if (skb_queue_empty(&local->pending[queue])) { + rcu_read_lock(); + list_for_each_entry_rcu(sdata, &local->interfaces, list) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) - netif_tx_wake_queue(netdev_get_tx_queue(sdata->dev, queue)); + netif_tx_wake_queue(netdev_get_tx_queue(sdata->dev, queue)); +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)) -+ netif_start_subqueue(sdata->dev, queue); ++ netif_start_subqueue(sdata->dev, queue); +#else -+ if (ieee80211_all_queues_started(hw)) -+ netif_wake_queue(sdata->dev); ++ if (ieee80211_all_queues_started(hw)) ++ netif_wake_queue(sdata->dev); +#endif - rcu_read_unlock(); - } - + rcu_read_unlock(); + } else + tasklet_schedule(&local->tx_pending_tasklet); @@ -321,7 +340,13 @@ static void __ieee80211_stop_queue(struc rcu_read_lock();
@@ -107,6 +107,22 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb() ieee80211_set_qos_hdr(local, skb); ieee80211_tx(sdata, skb, false); rcu_read_unlock(); +@@ -2039,8 +2039,15 @@ void ieee80211_tx_pending(unsigned long + + if (skb_queue_empty(&local->pending[i])) + list_for_each_entry_rcu(sdata, &local->interfaces, list) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) + netif_tx_wake_queue( + netdev_get_tx_queue(sdata->dev, i)); ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)) ++ netif_start_subqueue(sdata->dev, i); ++#else ++ if (ieee80211_all_queues_started(hw)) ++ netif_wake_queue(sdata->dev); ++#endif + } + spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags); + --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -660,11 +660,13 @@ static void ieee80211_teardown_sdata(str
Quoted 6 lines · Pavel Roskin
Adjust for spacing change in
net/mac80211/util.c. Add a replacement fornetif_tx_wake_queue()fornet/mac80211/tx.cSigned-off-by Pavel Roskin <[email protected]>---
0 files changed, 0 insertions(+), 0 deletions(-)
Out of curiosity, how did you manage to generate that?
johannes
Quoted 9 lines · Johannes Berg
Quoted 6 lines · Pavel Roskin
Adjust for spacing change in
net/mac80211/util.c. Add a replacement fornetif_tx_wake_queue()fornet/mac80211/tx.cSigned-off-by Pavel Roskin <[email protected]>---
0 files changed, 0 insertions(+), 0 deletions(-)Out of curiosity, how did you manage to generate that?
If you mean "0 files changed", I guess it's a bug in STGit.
If you mean the patch. I applied the original patch to util.c with "-l", made sure that it's sane, adjusted spacing and added the patch to STGit. Then I found that the same construct propagated to tx.c, so I added the same ifdefs there, made a diff and added in manually to the existing diff for tx.c.
Signature · 2 lines
Regards, Pavel Roskin
Quoted 5 lines · Pavel Roskin
Quoted 4 lines · Johannes Berg
Quoted 3 lines · Pavel Roskin
Adjust for spacing change in
net/mac80211/util.c. Add a replacement fornetif_tx_wake_queue()fornet/mac80211/tx.c
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Signed-off-by Pavel Roskin <[email protected]>---
0 files changed, 0 insertions(+), 0 deletions(-)Out of curiosity, how did you manage to generate that?
If you mean "0 files changed", I guess it's a bug in STGit.
I meant that, yeah. Struck me as strange :)
johannes