compat-wireless: make patches apply again

This part of the patch is now in wireless-testing.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/patches/22-multiqueue.patch b/patches/22-multiqueue.patch
index 20903202508a6e5c918a1c78431df3bfb237afc3..05129d5f598af636656897ced5fecfc786b3fb20 100644 (file)
--- a/patches/22-multiqueue.patch
+++ b/patches/22-multiqueue.patch
@@ -44,17 +44,6 @@ are used for injecting frames so they have their own respective queue
 handling, but mac80211 just always sends management frames on VO
 queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb()
 
---- a/drivers/net/wireless/wl12xx/main.c
-+++ b/drivers/net/wireless/wl12xx/main.c
-@@ -1272,7 +1272,7 @@ static struct sk_buff *wl12xx_alloc_dumm
-       skb->priority = WL1271_TID_MGMT;
- 
-       /* Initialize all fields that might be used */
--      skb->queue_mapping = 0;
-+      skb_set_queue_mapping(skb, 0);
-       memset(IEEE80211_SKB_CB(skb), 0, sizeof(struct ieee80211_tx_info));
- 
-       return skb;
 --- a/net/mac80211/util.c
 +++ b/net/mac80211/util.c
 @@ -264,6 +264,18 @@ __le16 ieee80211_ctstoself_duration(stru
@@ -107,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
-@@ -1598,6 +1598,10 @@ static void ieee80211_xmit(struct ieee80
+@@ -1587,6 +1587,10 @@ static void ieee80211_xmit(struct ieee80
                                return;
                        }
  
@@ -118,7 +107,7 @@ 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();
-@@ -2090,7 +2094,14 @@ void ieee80211_tx_pending(unsigned long
+@@ -2079,7 +2083,14 @@ void ieee80211_tx_pending(unsigned long
  
                if (skb_queue_empty(&local->pending[i]))
                        list_for_each_entry_rcu(sdata, &local->interfaces, list)