diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2019-02-15 18:43:55 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-02-17 17:33:18 +0100 |
commit | d48a8ed40d3d1b65eec9c848828c6c0e2928cf07 (patch) | |
tree | a9d76b409892bf8f354099730732aeab3760742f /package/kernel/mac80211/patches/ath/554-ath9k-dynack-move-debug-log-after-buffer-increments.patch | |
parent | c8a30172f88f3df6d58dd3f67c5c12ef9472e979 (diff) | |
download | upstream-d48a8ed40d3d1b65eec9c848828c6c0e2928cf07.tar.gz upstream-d48a8ed40d3d1b65eec9c848828c6c0e2928cf07.tar.bz2 upstream-d48a8ed40d3d1b65eec9c848828c6c0e2928cf07.zip |
mac80211: update to version 4.19.23-1
This updates mac80211 to backports version 4.19.23-1 which includes all
the stable fixes from kernel 4.19.23.
The removed patches are included in this version.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/kernel/mac80211/patches/ath/554-ath9k-dynack-move-debug-log-after-buffer-increments.patch')
-rw-r--r-- | package/kernel/mac80211/patches/ath/554-ath9k-dynack-move-debug-log-after-buffer-increments.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/package/kernel/mac80211/patches/ath/554-ath9k-dynack-move-debug-log-after-buffer-increments.patch b/package/kernel/mac80211/patches/ath/554-ath9k-dynack-move-debug-log-after-buffer-increments.patch index a1d612660b..607722cc3d 100644 --- a/package/kernel/mac80211/patches/ath/554-ath9k-dynack-move-debug-log-after-buffer-increments.patch +++ b/package/kernel/mac80211/patches/ath/554-ath9k-dynack-move-debug-log-after-buffer-increments.patch @@ -12,9 +12,9 @@ Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com> --- a/drivers/net/wireless/ath/ath9k/dynack.c +++ b/drivers/net/wireless/ath/ath9k/dynack.c -@@ -171,11 +171,12 @@ static void ath_dynack_compute_to(struct - void ath_dynack_sample_tx_ts(struct ath_hw *ah, struct sk_buff *skb, - struct ath_tx_status *ts) +@@ -178,11 +178,12 @@ void ath_dynack_sample_tx_ts(struct ath_ + struct ath_tx_status *ts, + struct ieee80211_sta *sta) { - u8 ridx; struct ieee80211_hdr *hdr; @@ -24,9 +24,9 @@ Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com> + u32 dur = ts->duration; + u8 ridx; - if ((info->flags & IEEE80211_TX_CTL_NO_ACK) || !da->enabled) + if (!da->enabled || (info->flags & IEEE80211_TX_CTL_NO_ACK)) return; -@@ -203,14 +204,13 @@ void ath_dynack_sample_tx_ts(struct ath_ +@@ -217,14 +218,13 @@ void ath_dynack_sample_tx_ts(struct ath_ ridx = ts->ts_rateindex; da->st_rbf.ts[da->st_rbf.t_rb].tstamp = ts->ts_tstamp; @@ -42,7 +42,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com> rate = &common->sbands[info->band].bitrates[rates[ridx].idx]; if (info->band == NL80211_BAND_2GHZ && -@@ -219,19 +219,18 @@ void ath_dynack_sample_tx_ts(struct ath_ +@@ -233,19 +233,18 @@ void ath_dynack_sample_tx_ts(struct ath_ else phy = WLAN_RC_PHY_OFDM; @@ -68,7 +68,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com> ath_dynack_compute_to(ah); spin_unlock_bh(&da->qlock); -@@ -258,14 +257,13 @@ void ath_dynack_sample_ack_ts(struct ath +@@ -272,14 +271,13 @@ void ath_dynack_sample_ack_ts(struct ath spin_lock_bh(&da->qlock); da->ack_rbf.tstamp[da->ack_rbf.t_rb] = ts; |