mac80211: use sta_info_get_bss() for nl80211 tx and client probing
PATCH 1/2 mac80211: use sta_info_get_bss() for nl80211 tx and client probing
This allows calls for clients in AP_VLANs (e.g. for 4-addr) to succeed
--- net/mac80211/cfg.c | 2 +- net/mac80211/tx.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
net/mac80211/cfg.c +1 -1
@@ -3518,7 +3518,7 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev,return -EINVAL ; } band = chanctx_conf->def.chan->band; - sta =sta_info_get (sdata, peer); + sta =sta_info_get_bss (sdata, peer);if (sta) { qos =test_sta_flag (sta,WLAN_STA_WME ); }else {
net/mac80211/tx.c +2 -1
@@ -1120,7 +1120,8 @@ ieee80211_tx_prepare(struct ieee80211_sub_if_data *sdata, tx->sta =rcu_dereference (sdata->u.vlan.sta);if (!tx->sta && sdata->dev->ieee80211_ptr->use_4addr)return TX_DROP ; - }else if (info->flags &IEEE80211_TX_CTL_INJECTED || + }else if (info->flags & (IEEE80211_TX_CTL_INJECTED | +IEEE80211_TX_INTFL_NL80211_FRAME_TX ) || tx->sdata->control_port_protocol == tx->skb->protocol) { tx->sta =sta_info_get_bss (sdata, hdr->addr1); }
Signature · 1 line
1.8.0.2
PATCH 2/2 mac80211: update sta->last_rx on acked tx frames
When clients are idle for too long, hostapd sends nullfunc frames for probing. When those are acked by the client, the idle time needs to be updated.
To make this work (and to avoid unnecessary probing), update sta->last_rx whenever an ACK was received for a tx packet. Only do this if the flag IEEE80211_HW_REPORTS_TX_ACK_STATUS is set.
--- net/mac80211/status.c | 3 +++ 1 file changed, 3 insertions(+)
net/mac80211/status.c +3 -0
@@ -180,6 +180,9 @@ static void ieee80211_frame_acked(struct sta_info *sta, struct sk_buff *skb)struct ieee80211_local *local = sta->local;struct ieee80211_sub_if_data *sdata = sta->sdata; +if (local->hw.flags &IEEE80211_HW_REPORTS_TX_ACK_STATUS ) + sta->last_rx = jiffies; +if (ieee80211_is_data_qos (mgmt->frame_control)) {struct ieee80211_hdr *hdr = (void *) skb->data;u8 *qc =ieee80211_get_qos_ctl (hdr);
Signature · 1 line
1.8.0.2
Johannes Berg
maintainerRe: [PATCH 3.12 2/2] mac80211: update sta->last_rx on acked tx frames
Quoted 7 lines · Felix Fietkau
When clients are idle for too long, hostapd sends nullfunc frames for probing. When those are acked by the client, the idle time needs to be updated.
To make this work (and to avoid unnecessary probing), update
sta->last_rxwhenever an ACK was received for a tx packet. Only do this if the flagIEEE80211_HW_REPORTS_TX_ACK_STATUSis set.
Why that last bit? If we got an ack status, wouldn't it be OK to do either way? Or are you saying drivers are lying more often than not otherwise?
johannes
Re: [PATCH 3.12 2/2] mac80211: update sta->last_rx on acked tx frames
Quoted 5 lines · Johannes Berg
Quoted 4 lines · Felix Fietkau
When clients are idle for too long, hostapd sends nullfunc frames for probing. When those are acked by the client, the idle time needs to be updated.
Quoted 7 lines
Quoted 3 lines
To make this work (and to avoid unnecessary probing), update
sta->last_rxwhenever an ACK was received for a tx packet. Only do this if the flagIEEE80211_HW_REPORTS_TX_ACK_STATUSis set.Why that last bit? If we got an ack status, wouldn't it be OK to do either way? Or are you saying drivers are lying more often than not otherwise?
I added that just in case, some drivers might not be fully reliable wrt. reporting the ACK status.
- Felix
Johannes Berg
maintainerRe: [PATCH 3.12 2/2] mac80211: update sta->last_rx on acked tx frames
Quoted 10 lines · Felix Fietkau
Quoted 9 lines · Johannes Berg
Quoted 7 lines · Felix Fietkau
When clients are idle for too long, hostapd sends nullfunc frames for probing. When those are acked by the client, the idle time needs to be updated.
To make this work (and to avoid unnecessary probing), update
sta->last_rxwhenever an ACK was received for a tx packet. Only do this if the flagIEEE80211_HW_REPORTS_TX_ACK_STATUSis set.
Quoted 5 lines
Quoted 3 lines
Why that last bit? If we got an ack status, wouldn't it be OK to do either way? Or are you saying drivers are lying more often than not otherwise?
I added that just in case, some drivers might not be fully reliable wrt. reporting the ACK status.
Ok, I'll apply it.
johannes
Quoted 1 line · Felix Fietkau
This allows calls for clients in
AP_VLANs(e.g. for 4-addr) to succeed
Applied.
johannes