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

WNM: Use defined macros for WNM-Sleep Mode Action Type values

Browse source 
Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2012-12-16 12:57:38 +02:00
parent 0a47a6a747
commit df80a0ccff
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/common/ieee802_11_defs.h
View file

@ -1048,11 +1048,14 @@ struct ieee80211_2040_intol_chan_report {
struct wnm_sleep_element { struct wnm_sleep_element {
u8 eid; /* WLAN_EID_WNMSLEEP */ u8 eid; /* WLAN_EID_WNMSLEEP */
u8 len; u8 len;
u8 action_type; /* WLAN_WNM_SLEEP_ENTER/EXIT */ u8 action_type; /* WNM_SLEEP_ENTER/WNM_SLEEP_MODE_EXIT */
u8 status; u8 status;
le16 intval; le16 intval;
} STRUCT_PACKED; } STRUCT_PACKED;
#define WNM_SLEEP_MODE_ENTER 0
#define WNM_SLEEP_MODE_EXIT 1
enum wnm_sleep_mode_response_status { enum wnm_sleep_mode_response_status {
WNM_STATUS_SLEEP_ACCEPT = 0, WNM_STATUS_SLEEP_ACCEPT = 0,
WNM_STATUS_SLEEP_EXIT_ACCEPT_GTK_UPDATE = 1, WNM_STATUS_SLEEP_EXIT_ACCEPT_GTK_UPDATE = 1,

3
wpa_supplicant/ctrl_iface.c
View file

@ -4715,7 +4715,8 @@ static int wpas_ctrl_iface_wnm_sleep(struct wpa_supplicant *wpa_s, char *cmd)
} }
} }
ret = ieee802_11_send_wnmsleep_req(wpa_s, enter ? 0 : 1, intval, ret = ieee802_11_send_wnmsleep_req(wpa_s, enter ? WNM_SLEEP_MODE_ENTER :
WNM_SLEEP_MODE_EXIT, intval,
tfs_req); tfs_req);
wpabuf_free(tfs_req); wpabuf_free(tfs_req);

8
wpa_supplicant/wnm_sta.c
View file

@ -188,7 +188,7 @@ static void ieee802_11_rx_wnmsleep_resp(struct wpa_supplicant *wpa_s,
wpa_printf(MSG_DEBUG, "Successfully recv WNM-Sleep Response " wpa_printf(MSG_DEBUG, "Successfully recv WNM-Sleep Response "
"frame (action=%d, intval=%d)", "frame (action=%d, intval=%d)",
wnmsleep_ie->action_type, wnmsleep_ie->intval); wnmsleep_ie->action_type, wnmsleep_ie->intval);
if (wnmsleep_ie->action_type == 0) { if (wnmsleep_ie->action_type == WNM_SLEEP_MODE_ENTER) {
wpa_drv_wnm_oper(wpa_s, WNM_SLEEP_ENTER_CONFIRM, wpa_drv_wnm_oper(wpa_s, WNM_SLEEP_ENTER_CONFIRM,
wpa_s->bssid, NULL, NULL); wpa_s->bssid, NULL, NULL);
/* remove GTK/IGTK ?? */ /* remove GTK/IGTK ?? */
@ -212,7 +212,7 @@ static void ieee802_11_rx_wnmsleep_resp(struct wpa_supplicant *wpa_s,
wpa_printf(MSG_DEBUG, "Fail to set " wpa_printf(MSG_DEBUG, "Fail to set "
"TFS Resp IE"); "TFS Resp IE");
} }
} else if (wnmsleep_ie->action_type == 1) { } else if (wnmsleep_ie->action_type == WNM_SLEEP_MODE_EXIT) {
u8 *ptr, *end; u8 *ptr, *end;
wpa_drv_wnm_oper(wpa_s, WNM_SLEEP_EXIT_CONFIRM, wpa_drv_wnm_oper(wpa_s, WNM_SLEEP_EXIT_CONFIRM,
wpa_s->bssid, NULL, NULL); wpa_s->bssid, NULL, NULL);
@ -270,10 +270,10 @@ static void ieee802_11_rx_wnmsleep_resp(struct wpa_supplicant *wpa_s,
wpa_printf(MSG_DEBUG, "Reject recv WNM-Sleep Response frame " wpa_printf(MSG_DEBUG, "Reject recv WNM-Sleep Response frame "
"(action=%d, intval=%d)", "(action=%d, intval=%d)",
wnmsleep_ie->action_type, wnmsleep_ie->intval); wnmsleep_ie->action_type, wnmsleep_ie->intval);
if (wnmsleep_ie->action_type == 0) if (wnmsleep_ie->action_type == WNM_SLEEP_MODE_ENTER)
wpa_drv_wnm_oper(wpa_s, WNM_SLEEP_ENTER_FAIL, wpa_drv_wnm_oper(wpa_s, WNM_SLEEP_ENTER_FAIL,
wpa_s->bssid, NULL, NULL); wpa_s->bssid, NULL, NULL);
else if (wnmsleep_ie->action_type == 1) else if (wnmsleep_ie->action_type == WNM_SLEEP_MODE_EXIT)
wpa_drv_wnm_oper(wpa_s, WNM_SLEEP_EXIT_FAIL, wpa_drv_wnm_oper(wpa_s, WNM_SLEEP_EXIT_FAIL,
wpa_s->bssid, NULL, NULL); wpa_s->bssid, NULL, NULL);
} }