mac80211: Split sending tx'ed frames to monitor interfaces into its own function
PATCH 1/2 mac80211: Split sending tx'ed frames to monitor interfaces into its own function
This allows ieee80211_tx_monitor to be used directly for sending 802.11 frames to all monitor interfaces.
--- net/mac80211/ieee80211_i.h | 3 ++ net/mac80211/status.c | 108 +++++++++++++++++++++++++-------------------- 2 files changed, 62 insertions(+), 49 deletions(-)
net/mac80211/ieee80211_i.h +3 -0
@@ -1641,6 +1641,9 @@ void ieee80211_purge_tx_queue(struct ieee80211_hw *hw,struct sk_buff *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);void ieee80211_check_fast_xmit (struct sta_info *sta);void ieee80211_check_fast_xmit_all (struct ieee80211_local *local);
net/mac80211/status.c +59 -49
133 lines not on this page · raw message
Signature · 1 line
1.8.4.5
PATCH 2/2 mac80211: Copy tx'ed beacons to monitor mode
When debugging wireless powersave issues on the AP side it's quite helpful to see our own beacons that are transmitted by the hardware/driver. However, this is not that easy since beacons don't pass through the regular TX queues.
Preferably drivers would call ieee80211_tx_status also for tx'ed beacons but that's not always possible. Hence, just send a copy of each beacon generated by ieee80211_beacon_get_tim to monitor devices when they are getting fetched by the driver.
Also add a HW flag IEEE80211_HW_BEACON_TX_STATUS that can be used by drivers to indicate that they report TX status for beacons.
---
Changes since RFC:
* don't send beacons to cooked monitors
* avoid assignment within if condition
* Introduce IEEE80211_HW_BEACON_TX_STATUS
include/net/mac80211.h | 4 ++++ net/mac80211/debugfs.c | 1 + net/mac80211/tx.c | 13 +++++++++++++ 3 files changed, 18 insertions(+)
include/net/mac80211.h +4 -0
@@ -1892,6 +1892,9 @@ struct ieee80211_txq {* @IEEE80211_HW_TDLS_WIDER_BW: The device/driver supports wider bandwidth * than then BSS bandwidth for a TDLS link on the base channel. * +* @IEEE80211_HW_BEACON_TX_STATUS: The device/driver provides TX status +* for sent beacons. +* * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays */ enum ieee80211_hw_flags {
@@ -1925,6 +1928,7 @@ enum ieee80211_hw_flags {IEEE80211_HW_SUPPORTS_CLONED_SKBS ,IEEE80211_HW_SINGLE_SCAN_ON_ALL_BANDS ,IEEE80211_HW_TDLS_WIDER_BW , +IEEE80211_HW_BEACON_TX_STATUS ,/* keep last, obviously */ NUM_IEEE80211_HW_FLAGS
net/mac80211/debugfs.c +1 -0
@@ -123,6 +123,7 @@ static const char *hw_flag_names[NUM_IEEE80211_HW_FLAGS + 1] = {FLAG (SUPPORTS_CLONED_SKBS ),FLAG (SINGLE_SCAN_ON_ALL_BANDS ),FLAG (TDLS_WIDER_BW ), +FLAG (BEACON_TX_STATUS ),/* keep last for the build bug below */ (void *)0x1
net/mac80211/tx.c +13 -0
@@ -3512,6 +3512,8 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw, {struct ieee80211_mutable_offsets offs = {};struct sk_buff *bcn =__ieee80211_beacon_get (hw, vif, &offs, false); +struct ieee80211_supported_band *sband; +int shift;if (tim_offset) *tim_offset = offs.tim_offset;
@@ -3519,6 +3521,17 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw,if (tim_length) *tim_length = offs.tim_length; +/* send a copy to monitor interfaces */ +if (!ieee80211_hw_check (hw,BEACON_TX_STATUS ) && +hw_to_local (hw)->monitors) { +struct sk_buff *copy =skb_copy (bcn,GFP_ATOMIC ); +if (copy) { + shift =ieee80211_vif_get_shift (vif); + sband = hw->wiphy->bands[ieee80211_get_sdata_band (vif_to_sdata (vif))]; +ieee80211_tx_monitor (hw_to_local (hw), copy, sband,1 , shift, false); + } + } +return bcn; }EXPORT_SYMBOL (ieee80211_beacon_get_tim);
Signature · 1 line
1.8.4.5
Johannes Berg
maintainerRe: [PATCH 2/2] mac80211: Copy tx'ed beacons to monitor mode
I applied patch 1, but
Quoted 11 lines
net/mac80211/tx.c +8
-1+/* send a copy to monitor interfaces */ +if (!ieee80211_hw_check (hw,BEACON_TX_STATUS ) && +hw_to_local (hw)->monitors) { +struct sk_buff *copy =skb_copy (bcn,GFP_ATOMIC ); +if (copy) { + shift =ieee80211_vif_get_shift (vif); + sband = hw->wiphy ->bands[ieee80211_get_sdata_band(vif_to_sdata(vif))]; + ieee80211_tx_monitor(hw_to_local(hw), copy,sband, 1, shift, false);
net/mac80211/tx.c struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw, · line 3534
Quoted 3 lines
net/mac80211/tx.c +3
-0+ } + } +
Please add a blank line after declarations and try to get shorter lines here.
johannes
PATCH v2 1/1 mac80211: Copy tx'ed beacons to monitor mode
In reply to Helmut SchaaWhen debugging wireless powersave issues on the AP side it's quite helpful to see our own beacons that are transmitted by the hardware/driver. However, this is not that easy since beacons don't pass through the regular TX queues.
Preferably drivers would call ieee80211_tx_status also for tx'ed beacons but that's not always possible. Hence, just send a copy of each beacon generated by ieee80211_beacon_get_tim to monitor devices when they are getting fetched by the driver.
Also add a HW flag IEEE80211_HW_BEACON_TX_STATUS that can be used by drivers to indicate that they report TX status for beacons.
---
Changes since RFC:
* don't send beacons to cooked monitors
* avoid assignment within if condition
* Introduce IEEE80211_HW_BEACON_TX_STATUS
Changes since v1:
* Invert logic to get shorter lines (<80 chars)
include/net/mac80211.h | 4 ++++ net/mac80211/debugfs.c | 1 + net/mac80211/tx.c | 16 ++++++++++++++++ 3 files changed, 21 insertions(+)
include/net/mac80211.h +4 -0
@@ -1892,6 +1892,9 @@ struct ieee80211_txq {* @IEEE80211_HW_TDLS_WIDER_BW: The device/driver supports wider bandwidth * than then BSS bandwidth for a TDLS link on the base channel. * +* @IEEE80211_HW_BEACON_TX_STATUS: The device/driver provides TX status +* for sent beacons. +* * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays */ enum ieee80211_hw_flags {
@@ -1925,6 +1928,7 @@ enum ieee80211_hw_flags {IEEE80211_HW_SUPPORTS_CLONED_SKBS ,IEEE80211_HW_SINGLE_SCAN_ON_ALL_BANDS ,IEEE80211_HW_TDLS_WIDER_BW , +IEEE80211_HW_BEACON_TX_STATUS ,/* keep last, obviously */ NUM_IEEE80211_HW_FLAGS
net/mac80211/debugfs.c +1 -0
@@ -123,6 +123,7 @@ static const char *hw_flag_names[NUM_IEEE80211_HW_FLAGS + 1] = {FLAG (SUPPORTS_CLONED_SKBS ),FLAG (SINGLE_SCAN_ON_ALL_BANDS ),FLAG (TDLS_WIDER_BW ), +FLAG (BEACON_TX_STATUS ),/* keep last for the build bug below */ (void *)0x1
net/mac80211/tx.c +16 -0
@@ -3512,6 +3512,9 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw, {struct ieee80211_mutable_offsets offs = {};struct sk_buff *bcn =__ieee80211_beacon_get (hw, vif, &offs, false); +struct sk_buff *copy; +struct ieee80211_supported_band *sband; +int shift;if (tim_offset) *tim_offset = offs.tim_offset;
@@ -3519,6 +3522,19 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw,if (tim_length) *tim_length = offs.tim_length; +if (ieee80211_hw_check (hw,BEACON_TX_STATUS ) || + !hw_to_local (hw)->monitors) +return bcn; + +/* send a copy to monitor interfaces */ + copy =skb_copy (bcn,GFP_ATOMIC ); +if (!copy) +return bcn; + + shift =ieee80211_vif_get_shift (vif); + sband = hw->wiphy->bands[ieee80211_get_sdata_band (vif_to_sdata (vif))]; +ieee80211_tx_monitor (hw_to_local (hw), copy, sband,1 , shift, false); +return bcn; }EXPORT_SYMBOL (ieee80211_beacon_get_tim);
Signature · 1 line
1.8.4.5
Re: [PATCHv2] mac80211: Copy tx'ed beacons to monitor mode
Quoted 15 lines · Helmut Schaa
When debugging wireless powersave issues on the AP side it's quite helpful
to see our own beacons that are transmitted by the hardware/driver. However,
this is not that easy since beacons don't pass through the regular TX queues.Preferably drivers would call
ieee80211_tx_statusalso for tx'ed beacons
but that's not always possible. Hence, just send a copy of each beacon
generated byieee80211_beacon_get_timto monitor devices when they are
getting fetched by the driver.
Quoted 3 lines
Also add a HW flag
IEEE80211_HW_BEACON_TX_STATUSthat can be used by drivers to indicate that they report TX status for beacons.
Applied.
johannes