DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Share usec-to/from-TU conversion macros in a general location

Browse source 
These can be used outside the context of FST and hostapd.c, so move the
macro definitions into a shared header file. In addition, fix the
currently unused US_TO_TU() definition and rename "US" to "USEC".

Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
This commit is contained in:
Aditya Kumar Singh 2024-07-16 11:54:49 +05:30 committed by Jouni Malinen
parent 69deac87fb
commit 9f334fe683
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ap/hostapd.c
View file

@ -400,8 +400,6 @@ static int hostapd_broadcast_wep_set(struct hostapd_data *hapd)
#ifdef CONFIG_IEEE80211BE #ifdef CONFIG_IEEE80211BE
#ifdef CONFIG_TESTING_OPTIONS #ifdef CONFIG_TESTING_OPTIONS
#define TU_TO_USEC(_val) ((_val) * 1024)
static void hostapd_link_remove_timeout_handler(void *eloop_data, static void hostapd_link_remove_timeout_handler(void *eloop_data,
void *user_ctx) void *user_ctx)
{ {

5
src/common/defs.h
View file

@ -532,4 +532,9 @@ enum sae_pwe {
SAE_PWE_NOT_SET = 4, SAE_PWE_NOT_SET = 4,
}; };
#define USEC_80211_TU 1024
#define USEC_TO_TU(m) ((m) / USEC_80211_TU)
#define TU_TO_USEC(m) ((m) * USEC_80211_TU)
#endif /* DEFS_H */ #endif /* DEFS_H */

8
src/fst/fst_session.c
View file

@ -18,11 +18,6 @@
#include "fst/fst_ctrl_defs.h" #include "fst/fst_ctrl_defs.h"
#endif /* CONFIG_FST_TEST */ #endif /* CONFIG_FST_TEST */
#define US_80211_TU 1024
#define US_TO_TU(m) ((m) * / US_80211_TU)
#define TU_TO_US(m) ((m) * US_80211_TU)
#define FST_LLT_SWITCH_IMMEDIATELY 0 #define FST_LLT_SWITCH_IMMEDIATELY 0
#define fst_printf_session(s, level, format, ...) \ #define fst_printf_session(s, level, format, ...) \
@ -182,7 +177,8 @@ static void fst_session_timeout_handler(void *eloop_data, void *user_ctx)
static void fst_session_stt_arm(struct fst_session *s) static void fst_session_stt_arm(struct fst_session *s)
{ {
/* Action frames sometimes get delayed. Use relaxed timeout (2*) */ /* Action frames sometimes get delayed. Use relaxed timeout (2*) */
eloop_register_timeout(0, 2 * TU_TO_US(FST_DEFAULT_SESSION_TIMEOUT_TU), eloop_register_timeout(0,
2 * TU_TO_USEC(FST_DEFAULT_SESSION_TIMEOUT_TU),
fst_session_timeout_handler, NULL, s); fst_session_timeout_handler, NULL, s);
s->stt_armed = true; s->stt_armed = true;
} }