diff options
Diffstat (limited to 'package/kernel/mac80211/patches/subsys/319-mac80211-reduce-duplication-in-tx-status-functions.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/subsys/319-mac80211-reduce-duplication-in-tx-status-functions.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/package/kernel/mac80211/patches/subsys/319-mac80211-reduce-duplication-in-tx-status-functions.patch b/package/kernel/mac80211/patches/subsys/319-mac80211-reduce-duplication-in-tx-status-functions.patch index e13723b160..83522a7541 100644 --- a/package/kernel/mac80211/patches/subsys/319-mac80211-reduce-duplication-in-tx-status-functions.patch +++ b/package/kernel/mac80211/patches/subsys/319-mac80211-reduce-duplication-in-tx-status-functions.patch @@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (ieee80211_is_data_qos(mgmt->frame_control)) { struct ieee80211_hdr *hdr = (void *) skb->data; -@@ -899,7 +887,8 @@ void ieee80211_tx_monitor(struct ieee802 +@@ -897,7 +885,8 @@ void ieee80211_tx_monitor(struct ieee802 } static void __ieee80211_tx_status(struct ieee80211_hw *hw, @@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> { struct sk_buff *skb = status->skb; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; -@@ -908,8 +897,6 @@ static void __ieee80211_tx_status(struct +@@ -906,8 +895,6 @@ static void __ieee80211_tx_status(struct struct sta_info *sta; __le16 fc; struct ieee80211_supported_band *sband; @@ -49,7 +49,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> bool send_to_cooked; bool acked; bool noack_success; -@@ -918,8 +905,6 @@ static void __ieee80211_tx_status(struct +@@ -916,8 +903,6 @@ static void __ieee80211_tx_status(struct int tid = IEEE80211_NUM_TIDS; u16 tx_time_est; @@ -58,7 +58,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> sband = local->hw.wiphy->bands[info->band]; fc = hdr->frame_control; -@@ -996,24 +981,14 @@ static void __ieee80211_tx_status(struct +@@ -994,24 +979,14 @@ static void __ieee80211_tx_status(struct if (info->flags & IEEE80211_TX_STAT_TX_FILTERED) { ieee80211_handle_filtered_frame(local, sta, skb); return; @@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (!(info->flags & IEEE80211_TX_CTL_INJECTED) && acked) ieee80211_frame_acked(sta, skb); -@@ -1038,20 +1013,6 @@ static void __ieee80211_tx_status(struct +@@ -1036,20 +1011,6 @@ static void __ieee80211_tx_status(struct true); ieee80211_info_set_tx_time_est(info, 0); } @@ -108,7 +108,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> } /* SNMP counters -@@ -1135,7 +1096,7 @@ void ieee80211_tx_status(struct ieee8021 +@@ -1133,7 +1094,7 @@ void ieee80211_tx_status(struct ieee8021 if (sta) status.sta = &sta->sta; @@ -117,7 +117,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> rcu_read_unlock(); } EXPORT_SYMBOL(ieee80211_tx_status); -@@ -1148,7 +1109,7 @@ void ieee80211_tx_status_ext(struct ieee +@@ -1146,7 +1107,7 @@ void ieee80211_tx_status_ext(struct ieee struct ieee80211_sta *pubsta = status->sta; struct ieee80211_supported_band *sband; struct sta_info *sta; @@ -126,7 +126,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> bool acked, noack_success; if (pubsta) { -@@ -1158,13 +1119,7 @@ void ieee80211_tx_status_ext(struct ieee +@@ -1156,13 +1117,7 @@ void ieee80211_tx_status_ext(struct ieee sta->tx_stats.last_rate_info = *status->rate; } @@ -141,7 +141,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> sband = hw->wiphy->bands[info->band]; -@@ -1176,20 +1131,30 @@ void ieee80211_tx_status_ext(struct ieee +@@ -1174,20 +1129,30 @@ void ieee80211_tx_status_ext(struct ieee sta->status_stats.retry_failed++; sta->status_stats.retry_count += retry_count; @@ -184,7 +184,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> } rate_control_tx_status(local, sband, status); -@@ -1197,6 +1162,10 @@ void ieee80211_tx_status_ext(struct ieee +@@ -1195,6 +1160,10 @@ void ieee80211_tx_status_ext(struct ieee ieee80211s_update_metric(local, sta, status); } |