Skip to content

Commit

Permalink
mac80211: propagate struct ieee80211_tx_status into ieee80211_tx_moni…
Browse files Browse the repository at this point in the history
…tor()

This will allow use to report HE rates on the radiotap interface.

Signed-off-by: John Crispin <john@phrozen.org>
Link: https://lore.kernel.org/r/20190714154419.11854-3-john@phrozen.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
John Crispin authored and Johannes Berg committed Jul 26, 2019
1 parent cbe77dd commit b7b2e8c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
3 changes: 2 additions & 1 deletion net/mac80211/ieee80211_i.h
Original file line number Diff line number Diff line change
Expand Up @@ -1768,7 +1768,8 @@ ieee80211_build_data_template(struct ieee80211_sub_if_data *sdata,
struct sk_buff *skb, u32 info_flags);
void ieee80211_tx_monitor(struct ieee80211_local *local, struct sk_buff *skb,
struct ieee80211_supported_band *sband,
int retry_count, int shift, bool send_to_cooked);
int retry_count, int shift, bool send_to_cooked,
struct ieee80211_tx_status *status);

void ieee80211_check_fast_xmit(struct sta_info *sta);
void ieee80211_check_fast_xmit_all(struct ieee80211_local *local);
Expand Down
6 changes: 4 additions & 2 deletions net/mac80211/status.c
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,8 @@ static int ieee80211_tx_get_rates(struct ieee80211_hw *hw,

void ieee80211_tx_monitor(struct ieee80211_local *local, struct sk_buff *skb,
struct ieee80211_supported_band *sband,
int retry_count, int shift, bool send_to_cooked)
int retry_count, int shift, bool send_to_cooked,
struct ieee80211_tx_status *status)
{
struct sk_buff *skb2;
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
Expand Down Expand Up @@ -901,7 +902,8 @@ static void __ieee80211_tx_status(struct ieee80211_hw *hw,
}

/* send to monitor interfaces */
ieee80211_tx_monitor(local, skb, sband, retry_count, shift, send_to_cooked);
ieee80211_tx_monitor(local, skb, sband, retry_count, shift,
send_to_cooked, status);
}

void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
Expand Down
3 changes: 2 additions & 1 deletion net/mac80211/tx.c
Original file line number Diff line number Diff line change
Expand Up @@ -4649,7 +4649,8 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw,
if (!sband)
return bcn;

ieee80211_tx_monitor(hw_to_local(hw), copy, sband, 1, shift, false);
ieee80211_tx_monitor(hw_to_local(hw), copy, sband, 1, shift, false,
NULL);

return bcn;
}
Expand Down

0 comments on commit b7b2e8c

Please sign in to comment.