mac80211: remove a redundant check
PATCH 1/2 mac80211: remove a redundant check
ieee80211_is_nullfunc() implies ieee80211_is_data()
Signed-off-by Felix Fietkau <[email protected]>
--- net/mac80211/mlme.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
net/mac80211/mlme.c +1 -2
@@ -1067,8 +1067,7 @@ static void ieee80211_reset_ap_probe(struct ieee80211_sub_if_data *sdata)void ieee80211_sta_tx_notify (struct ieee80211_sub_if_data *sdata,struct ieee80211_hdr *hdr) { -if (!ieee80211_is_data (hdr->frame_control) && - !ieee80211_is_nullfunc (hdr->frame_control)) +if (!ieee80211_is_data (hdr->frame_control))return ;ieee80211_sta_reset_conn_monitor (sdata);
Signature · 1 line
1.7.3.2
PATCH 2/2 mac80211: speed up AP probing using nullfunc frames
If the nullfunc frame used to probe the AP was not acked, there is no point in waiting for the probe timeout, so advance to the next try (or disconnect) immediately.
If we do reach the probe timeout without having received a tx status, the connection is probably really bad and worth disconnecting.
Signed-off-by Felix Fietkau <[email protected]>
--- net/mac80211/ieee80211_i.h | 3 +- net/mac80211/mlme.c | 93 ++++++++++++++++++++++++++++++++------------ net/mac80211/status.c | 18 ++++---- 3 files changed, 79 insertions(+), 35 deletions(-)
net/mac80211/ieee80211_i.h +2 -1
@@ -357,6 +357,7 @@ struct ieee80211_if_managed {unsigned long beacon_timeout;unsigned long probe_timeout;int probe_send_count; +bool nullfunc_failed;struct mutex mtx;struct cfg80211_bss *associated;
@@ -1271,7 +1272,7 @@ void ieee80211_send_nullfunc(struct ieee80211_local *local,void ieee80211_sta_rx_notify (struct ieee80211_sub_if_data *sdata,struct ieee80211_hdr *hdr);void ieee80211_sta_tx_notify (struct ieee80211_sub_if_data *sdata, -struct ieee80211_hdr *hdr); +struct ieee80211_hdr *hdr,bool ack);void ieee80211_beacon_connection_loss_work (struct work_struct *work); void ieee80211_wake_queues_by_reason(struct ieee80211_hw *hw,
net/mac80211/mlme.c +68 -25
137 lines not on this page · raw message
net/mac80211/status.c +9 -9
@@ -155,10 +155,6 @@ static void ieee80211_frame_acked(struct sta_info *sta, struct sk_buff *skb)ieee80211_queue_work (&local->hw, &local->recalc_smps); } - -if ((sdata->vif.type ==NL80211_IFTYPE_STATION ) && - (local->hw.flags &IEEE80211_HW_REPORTS_TX_ACK_STATUS )) -ieee80211_sta_tx_notify (sdata, (void *) skb->data); }/*
@@ -186,6 +182,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)int retry_count =-1 , i;int rates_idx =-1 ;bool send_to_cooked; +bool acked;for (i =0 ; i <IEEE80211_TX_MAX_RATES ; i++) {/* the HW cannot have attempted that rate */
@@ -211,8 +208,8 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)if (memcmp (hdr->addr2, sta->sdata->vif.addr,ETH_ALEN ))continue ; -if (!(info->flags &IEEE80211_TX_STAT_ACK ) && -test_sta_flags (sta,WLAN_STA_PS_STA )) { + acked = !!(info->flags &IEEE80211_TX_STAT_ACK ); +if (!acked &&test_sta_flags (sta,WLAN_STA_PS_STA )) {/* * The STA is in power save mode, so assume * that this TX packet failed because of that.
@@ -244,7 +241,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)rcu_read_unlock ();return ; }else { -if (!(info->flags &IEEE80211_TX_STAT_ACK )) +if (!acked) sta->tx_retry_failed++; sta->tx_retry_count += retry_count; }
@@ -253,10 +250,13 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)if (ieee80211_vif_is_mesh (&sta->sdata->vif))ieee80211s_update_metric (local, sta, skb); -if (!(info->flags &IEEE80211_TX_CTL_INJECTED ) && - (info->flags &IEEE80211_TX_STAT_ACK )) +if (!(info->flags &IEEE80211_TX_CTL_INJECTED ) && acked)ieee80211_frame_acked (sta, skb); +if ((sta->sdata->vif.type ==NL80211_IFTYPE_STATION ) && + (local->hw.flags &IEEE80211_HW_REPORTS_TX_ACK_STATUS )) +ieee80211_sta_tx_notify (sta->sdata, (void *) skb->data, acked); +if (local->hw.flags &IEEE80211_HW_REPORTS_TX_ACK_STATUS ) {if (info->flags &IEEE80211_TX_STAT_ACK ) {if (sta->lost_packets)
Signature · 1 line
1.7.3.2