From df80a0ccff0b69a9527e2dab1748f311d214faad Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 16 Dec 2012 12:57:38 +0200 Subject: [PATCH] WNM: Use defined macros for WNM-Sleep Mode Action Type values Signed-hostap: Jouni Malinen --- src/common/ieee802_11_defs.h | 5 ++++- wpa_supplicant/ctrl_iface.c | 3 ++- wpa_supplicant/wnm_sta.c | 8 ++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/common/ieee802_11_defs.h b/src/common/ieee802_11_defs.h index 07c85807a..484a5b9c4 100644 --- a/src/common/ieee802_11_defs.h +++ b/src/common/ieee802_11_defs.h @@ -1048,11 +1048,14 @@ struct ieee80211_2040_intol_chan_report { struct wnm_sleep_element { u8 eid; /* WLAN_EID_WNMSLEEP */ u8 len; - u8 action_type; /* WLAN_WNM_SLEEP_ENTER/EXIT */ + u8 action_type; /* WNM_SLEEP_ENTER/WNM_SLEEP_MODE_EXIT */ u8 status; le16 intval; } STRUCT_PACKED; +#define WNM_SLEEP_MODE_ENTER 0 +#define WNM_SLEEP_MODE_EXIT 1 + enum wnm_sleep_mode_response_status { WNM_STATUS_SLEEP_ACCEPT = 0, WNM_STATUS_SLEEP_EXIT_ACCEPT_GTK_UPDATE = 1, diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index 7a27abdb6..904a12eaa 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -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); wpabuf_free(tfs_req); diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c index a2abf61ac..331b7e74e 100644 --- a/wpa_supplicant/wnm_sta.c +++ b/wpa_supplicant/wnm_sta.c @@ -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 " "frame (action=%d, intval=%d)", 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_s->bssid, NULL, NULL); /* 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 " "TFS Resp IE"); } - } else if (wnmsleep_ie->action_type == 1) { + } else if (wnmsleep_ie->action_type == WNM_SLEEP_MODE_EXIT) { u8 *ptr, *end; wpa_drv_wnm_oper(wpa_s, WNM_SLEEP_EXIT_CONFIRM, 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 " "(action=%d, intval=%d)", 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_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_s->bssid, NULL, NULL); }