Commit b7b2e8ca authored by John Crispin's avatar John Crispin Committed by Johannes Berg
Browse files

mac80211: propagate struct ieee80211_tx_status into ieee80211_tx_monitor() 



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

Signed-off-by: default avatarJohn Crispin <john@phrozen.org>
Link: https://lore.kernel.org/r/20190714154419.11854-3-john@phrozen.org


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent cbe77dde

net/mac80211/ieee80211_i.h

+2 −1
Original line number Diff line number Diff line
@@ -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);

net/mac80211/status.c

+4 −2
Original line number Diff line number Diff line
@@ -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);
@@ -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)

net/mac80211/tx.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE