diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-03-11 15:02:47 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-11 15:02:47 +0000 |
commit | 1e5b7c17b031359a37ed7772b92cc98aaaeac727 (patch) | |
tree | 5e2a88ef16da6f5c7c3b74ef607e5ba892252d5b /package/kernel/mac80211/patches/315-mac80211-add-tx_status_noskb-to-rate_control_ops.patch | |
parent | ee1e8c2f2df3b03ef89e5a8b31ae9e2f9907ade1 (diff) | |
download | upstream-1e5b7c17b031359a37ed7772b92cc98aaaeac727.tar.gz upstream-1e5b7c17b031359a37ed7772b92cc98aaaeac727.tar.bz2 upstream-1e5b7c17b031359a37ed7772b92cc98aaaeac727.zip |
mac80211: update to wireless-testing 2015-03-09
Based on patch by Bryan Forbes <bryan@reigndropsfall.net>
Also update mt76 to update for API changes
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 44655
Diffstat (limited to 'package/kernel/mac80211/patches/315-mac80211-add-tx_status_noskb-to-rate_control_ops.patch')
-rw-r--r-- | package/kernel/mac80211/patches/315-mac80211-add-tx_status_noskb-to-rate_control_ops.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/package/kernel/mac80211/patches/315-mac80211-add-tx_status_noskb-to-rate_control_ops.patch b/package/kernel/mac80211/patches/315-mac80211-add-tx_status_noskb-to-rate_control_ops.patch deleted file mode 100644 index 8a939709b4..0000000000 --- a/package/kernel/mac80211/patches/315-mac80211-add-tx_status_noskb-to-rate_control_ops.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Felix Fietkau <nbd@openwrt.org> -Date: Sat, 15 Nov 2014 22:23:44 +0100 -Subject: [PATCH] mac80211: add tx_status_noskb to rate_control_ops - -This op works like .tx_status, except it does not need access to the -skb. This will be used by drivers that cannot match tx status -information to specific packets. - -Signed-off-by: Felix Fietkau <nbd@openwrt.org> ---- - ---- a/include/net/mac80211.h -+++ b/include/net/mac80211.h -@@ -4727,6 +4727,10 @@ struct rate_control_ops { - void (*free_sta)(void *priv, struct ieee80211_sta *sta, - void *priv_sta); - -+ void (*tx_status_noskb)(void *priv, -+ struct ieee80211_supported_band *sband, -+ struct ieee80211_sta *sta, void *priv_sta, -+ struct ieee80211_tx_info *info); - void (*tx_status)(void *priv, struct ieee80211_supported_band *sband, - struct ieee80211_sta *sta, void *priv_sta, - struct sk_buff *skb); ---- a/net/mac80211/rate.h -+++ b/net/mac80211/rate.h -@@ -37,11 +37,15 @@ static inline void rate_control_tx_statu - struct rate_control_ref *ref = local->rate_ctrl; - struct ieee80211_sta *ista = &sta->sta; - void *priv_sta = sta->rate_ctrl_priv; -+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); - - if (!ref || !test_sta_flag(sta, WLAN_STA_RATE_CONTROL)) - return; - -- ref->ops->tx_status(ref->priv, sband, ista, priv_sta, skb); -+ if (ref->ops->tx_status) -+ ref->ops->tx_status(ref->priv, sband, ista, priv_sta, skb); -+ else -+ ref->ops->tx_status_noskb(ref->priv, sband, ista, priv_sta, info); - } - - |