aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index d7915ab15a43..07d03e791bc0 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -115,7 +115,7 @@ static void run_again(struct ieee80211_if_managed *ifmgd,
115 mod_timer(&ifmgd->timer, timeout); 115 mod_timer(&ifmgd->timer, timeout);
116} 116}
117 117
118static void mod_beacon_timer(struct ieee80211_sub_if_data *sdata) 118void ieee80211_sta_reset_beacon_monitor(struct ieee80211_sub_if_data *sdata)
119{ 119{
120 if (sdata->local->hw.flags & IEEE80211_HW_BEACON_FILTER) 120 if (sdata->local->hw.flags & IEEE80211_HW_BEACON_FILTER)
121 return; 121 return;
@@ -1390,7 +1390,7 @@ static bool ieee80211_assoc_success(struct ieee80211_work *wk,
1390 * Also start the timer that will detect beacon loss. 1390 * Also start the timer that will detect beacon loss.
1391 */ 1391 */
1392 ieee80211_sta_rx_notify(sdata, (struct ieee80211_hdr *)mgmt); 1392 ieee80211_sta_rx_notify(sdata, (struct ieee80211_hdr *)mgmt);
1393 mod_beacon_timer(sdata); 1393 ieee80211_sta_reset_beacon_monitor(sdata);
1394 1394
1395 return true; 1395 return true;
1396} 1396}
@@ -1493,7 +1493,7 @@ static void ieee80211_rx_mgmt_probe_resp(struct ieee80211_sub_if_data *sdata,
1493 * we have or will be receiving any beacons or data, so let's 1493 * we have or will be receiving any beacons or data, so let's
1494 * schedule the timers again, just in case. 1494 * schedule the timers again, just in case.
1495 */ 1495 */
1496 mod_beacon_timer(sdata); 1496 ieee80211_sta_reset_beacon_monitor(sdata);
1497 1497
1498 mod_timer(&ifmgd->conn_mon_timer, 1498 mod_timer(&ifmgd->conn_mon_timer,
1499 round_jiffies_up(jiffies + 1499 round_jiffies_up(jiffies +
@@ -1619,7 +1619,7 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
1619 * Push the beacon loss detection into the future since 1619 * Push the beacon loss detection into the future since
1620 * we are processing a beacon from the AP just now. 1620 * we are processing a beacon from the AP just now.
1621 */ 1621 */
1622 mod_beacon_timer(sdata); 1622 ieee80211_sta_reset_beacon_monitor(sdata);
1623 1623
1624 ncrc = crc32_be(0, (void *)&mgmt->u.beacon.beacon_int, 4); 1624 ncrc = crc32_be(0, (void *)&mgmt->u.beacon.beacon_int, 4);
1625 ncrc = ieee802_11_parse_elems_crc(mgmt->u.beacon.variable, 1625 ncrc = ieee802_11_parse_elems_crc(mgmt->u.beacon.variable,