aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-11-19 14:08:11 -0500
committerJohannes Berg <johannes.berg@intel.com>2014-11-28 09:01:50 -0500
commitad9dda6383317b3ec1dc0d321859c8a0ec9523df (patch)
tree3433aa4052c0e3311c8535d881e4c42ab9b43522 /net/mac80211
parent63558a650aabb43470549b4ad323d1cecd2da708 (diff)
mac80211: pass tx info to ieee80211_lost_packet instead of an skb
Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/status.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index 71de2d3866cc..7d706d8471c3 100644
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -592,10 +592,9 @@ static void ieee80211_tx_latency_end_msrmnt(struct ieee80211_local *local,
592#define STA_LOST_TDLS_PKT_THRESHOLD 10 592#define STA_LOST_TDLS_PKT_THRESHOLD 10
593#define STA_LOST_TDLS_PKT_TIME (10*HZ) /* 10secs since last ACK */ 593#define STA_LOST_TDLS_PKT_TIME (10*HZ) /* 10secs since last ACK */
594 594
595static void ieee80211_lost_packet(struct sta_info *sta, struct sk_buff *skb) 595static void ieee80211_lost_packet(struct sta_info *sta,
596 struct ieee80211_tx_info *info)
596{ 597{
597 struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
598
599 /* This packet was aggregated but doesn't carry status info */ 598 /* This packet was aggregated but doesn't carry status info */
600 if ((info->flags & IEEE80211_TX_CTL_AMPDU) && 599 if ((info->flags & IEEE80211_TX_CTL_AMPDU) &&
601 !(info->flags & IEEE80211_TX_STAT_AMPDU)) 600 !(info->flags & IEEE80211_TX_STAT_AMPDU))
@@ -767,7 +766,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
767 if (test_sta_flag(sta, WLAN_STA_TDLS_PEER_AUTH)) 766 if (test_sta_flag(sta, WLAN_STA_TDLS_PEER_AUTH))
768 sta->last_tdls_pkt_time = jiffies; 767 sta->last_tdls_pkt_time = jiffies;
769 } else { 768 } else {
770 ieee80211_lost_packet(sta, skb); 769 ieee80211_lost_packet(sta, info);
771 } 770 }
772 } 771 }
773 772