jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

AP: Fix inactivity STA timer trigger for driver offload case

Browse source 
Some non-mac80211 drivers, such as ath6kl, support STA inactivity timer
in firmware and may not provide connected stations' idle time to the
userspace. If the driver indicates support for offloaded operation, do
not start the inactivity timer in the hostapd.

Signed-hostap: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
This commit is contained in:
Mohammed Shafi Shajakhan 2013-05-16 20:14:31 +05:30 committed by Jouni Malinen
parent 1245503188
commit 336167c80e
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/ap/hostapd.c
View file

@ -1980,13 +1980,15 @@ void hostapd_new_assoc_sta(struct hostapd_data *hapd, struct sta_info *sta,
} else } else
wpa_auth_sta_associated(hapd->wpa_auth, sta->wpa_sm); wpa_auth_sta_associated(hapd->wpa_auth, sta->wpa_sm);
wpa_printf(MSG_DEBUG, "%s: reschedule ap_handle_timer timeout " if (!(hapd->iface->drv_flags & WPA_DRIVER_FLAGS_INACTIVITY_TIMER)) {
"for " MACSTR " (%d seconds - ap_max_inactivity)", wpa_printf(MSG_DEBUG, "%s: reschedule ap_handle_timer timeout "
__func__, MAC2STR(sta->addr), "for " MACSTR " (%d seconds - ap_max_inactivity)",
hapd->conf->ap_max_inactivity); __func__, MAC2STR(sta->addr),
eloop_cancel_timeout(ap_handle_timer, hapd, sta); hapd->conf->ap_max_inactivity);
eloop_register_timeout(hapd->conf->ap_max_inactivity, 0, eloop_cancel_timeout(ap_handle_timer, hapd, sta);
ap_handle_timer, hapd, sta); eloop_register_timeout(hapd->conf->ap_max_inactivity, 0,
ap_handle_timer, hapd, sta);
}
} }

15
src/ap/sta_info.c
View file

@ -545,13 +545,16 @@ struct sta_info * ap_sta_add(struct hostapd_data *hapd, const u8 *addr)
sta->acct_interim_interval = hapd->conf->acct_interim_interval; sta->acct_interim_interval = hapd->conf->acct_interim_interval;
accounting_sta_get_id(hapd, sta); accounting_sta_get_id(hapd, sta);
if (!(hapd->iface->drv_flags & WPA_DRIVER_FLAGS_INACTIVITY_TIMER)) {
wpa_printf(MSG_DEBUG, "%s: register ap_handle_timer timeout "
"for " MACSTR " (%d seconds - ap_max_inactivity)",
__func__, MAC2STR(addr),
hapd->conf->ap_max_inactivity);
eloop_register_timeout(hapd->conf->ap_max_inactivity, 0,
ap_handle_timer, hapd, sta);
}
/* initialize STA info data */ /* initialize STA info data */
wpa_printf(MSG_DEBUG, "%s: register ap_handle_timer timeout "
"for " MACSTR " (%d seconds - ap_max_inactivity)",
__func__, MAC2STR(addr),
hapd->conf->ap_max_inactivity);
eloop_register_timeout(hapd->conf->ap_max_inactivity, 0,
ap_handle_timer, hapd, sta);
os_memcpy(sta->addr, addr, ETH_ALEN); os_memcpy(sta->addr, addr, ETH_ALEN);
sta->next = hapd->sta_list; sta->next = hapd->sta_list;
hapd->sta_list = sta; hapd->sta_list = sta;