mac80211: use nullfunc instead of probe request for connection monitoring
PATCH v4 1/2 mac80211: use nullfunc instead of probe request for connection monitoring
nullfunc frames are better for connection monitoring, because probe requests are answered even if the AP has already dropped the connection, whereas nullfunc frames from an unassociated station will trigger a disassoc/deauth frame from the AP (WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA), which allows the station to reconnect immediately instead of waiting until it attempts to transmit the next unicast frame.
This only works on hardware with reliable tx ACK reporting, any other hardware needs to fall back to the probe request method.
--- net/mac80211/ieee80211_i.h | 2 + net/mac80211/mlme.c | 92 +++++++++++++++++++++++++++++++------------ net/mac80211/status.c | 4 ++ 3 files changed, 72 insertions(+), 26 deletions(-)
net/mac80211/ieee80211_i.h +2 -0
@@ -1264,6 +1264,8 @@ void ieee80211_send_nullfunc(struct ieee80211_local *local, int powersave);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);void ieee80211_beacon_connection_loss_work (struct work_struct *work); void ieee80211_wake_queues_by_reason(struct ieee80211_hw *hw,
net/mac80211/mlme.c +66 -26
116 lines not on this page · raw message
net/mac80211/status.c +4 -0
@@ -155,6 +155,10 @@ 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); }void ieee80211_tx_status (struct ieee80211_hw *hw,struct sk_buff *skb)
Signature · 1 line
1.7.3.2
PATCH v4 2/2 mac80211: reduce the number of retries for nullfunc probing
Since nullfunc frames are transmitted as unicast frames, they're more reliable than the broadcast probe requests, so we need fewer retries to figure out whether the AP is really gone.
--- net/mac80211/mlme.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)
net/mac80211/mlme.c +8 -1
@@ -28,6 +28,7 @@#include "rate.h" #include "led.h" +#define IEEE80211_MAX_NULLFUNC_TRIES 2#define IEEE80211_MAX_PROBE_TRIES 5/*
@@ -1916,9 +1917,15 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata) IEEE80211_STA_CONNECTION_POLL) && ifmgd->associated) {u8 bssid[ETH_ALEN ]; +int max_tries;memcpy (bssid, ifmgd->associated->bssid,ETH_ALEN ); +if (local->hw.flags &IEEE80211_HW_REPORTS_TX_ACK_STATUS ) + max_tries =IEEE80211_MAX_NULLFUNC_TRIES ; +else + max_tries =IEEE80211_MAX_PROBE_TRIES ; +/* ACK received for nullfunc probing frame */ if (!ifmgd->probe_send_count)ieee80211_reset_ap_probe (sdata);
@@ -1926,7 +1933,7 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata)else if (time_is_after_jiffies (ifmgd->probe_timeout))run_again (ifmgd, ifmgd->probe_timeout); -else if (ifmgd->probe_send_count <IEEE80211_MAX_PROBE_TRIES ) { +else if (ifmgd->probe_send_count < max_tries) {#ifdef CONFIG_MAC80211_VERBOSE_DEBUG wiphy_debug (local->hw.wiphy, "%s: No probe response from AP %pM"
Signature · 1 line
1.7.3.2