diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-05-04 22:39:52 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-05-05 00:05:28 +0200 |
| commit | 607809dcdc69b1ce90b6eab70222a01b43cedfd4 (patch) | |
| tree | 870b2125cc9f858a69369533d3821afad09f24a1 /package/kernel/mac80211/patches/subsys/300-mac80211-add-stop-start-logic-for-software-TXQs.patch | |
| parent | 96d280cc370020e5d2ea7555119f2f2bfeb221f2 (diff) | |
| download | upstream-607809dcdc69b1ce90b6eab70222a01b43cedfd4.tar.gz upstream-607809dcdc69b1ce90b6eab70222a01b43cedfd4.tar.bz2 upstream-607809dcdc69b1ce90b6eab70222a01b43cedfd4.zip | |
mac80211: Update to version 4.19.120
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/kernel/mac80211/patches/subsys/300-mac80211-add-stop-start-logic-for-software-TXQs.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/subsys/300-mac80211-add-stop-start-logic-for-software-TXQs.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/kernel/mac80211/patches/subsys/300-mac80211-add-stop-start-logic-for-software-TXQs.patch b/package/kernel/mac80211/patches/subsys/300-mac80211-add-stop-start-logic-for-software-TXQs.patch index e57a33ec1f..afb88dbe67 100644 --- a/package/kernel/mac80211/patches/subsys/300-mac80211-add-stop-start-logic-for-software-TXQs.patch +++ b/package/kernel/mac80211/patches/subsys/300-mac80211-add-stop-start-logic-for-software-TXQs.patch @@ -77,7 +77,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> atomic_t agg_queue_stop[IEEE80211_MAX_QUEUES]; -@@ -2046,6 +2048,7 @@ void ieee80211_txq_remove_vlan(struct ie +@@ -2047,6 +2049,7 @@ void ieee80211_txq_remove_vlan(struct ie struct ieee80211_sub_if_data *sdata); void ieee80211_fill_txq_stats(struct cfg80211_txq_stats *txqstats, struct txq_info *txqi); @@ -100,7 +100,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> (unsigned long) local); --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -3485,13 +3485,19 @@ struct sk_buff *ieee80211_tx_dequeue(str +@@ -3487,13 +3487,19 @@ struct sk_buff *ieee80211_tx_dequeue(str struct ieee80211_tx_info *info; struct ieee80211_tx_data tx; ieee80211_tx_result r; @@ -122,7 +122,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com> /* Make sure fragments stay together. */ skb = __skb_dequeue(&txqi->frags); if (skb) -@@ -3586,6 +3592,7 @@ begin: +@@ -3606,6 +3612,7 @@ begin: } IEEE80211_SKB_CB(skb)->control.vif = vif; |