Moved WMM action category definition into ieee802_11_defs.h

hostapd/ieee802_11.c

@@ -1672,7 +1672,7 @@ static void handle_action(struct hostapd_data *hapd,
 		return;
 	}
 #endif /* CONFIG_IEEE80211R */
-	case WME_ACTION_CATEGORY:
+	case WLAN_ACTION_WMM:
 		hostapd_wme_action(hapd, mgmt, len);
 		return;
 #ifdef CONFIG_IEEE80211W

hostapd/wme.c

@@ -141,7 +141,7 @@ static void wme_send_action(struct hostapd_data *hapd, const u8 *addr,
 	os_memcpy(m->da, addr, ETH_ALEN);
 	os_memcpy(m->sa, hapd->own_addr, ETH_ALEN);
 	os_memcpy(m->bssid, hapd->own_addr, ETH_ALEN);
-	m->u.action.category = WME_ACTION_CATEGORY;
+	m->u.action.category = WLAN_ACTION_WMM;
 	m->u.action.u.wme_action.action_code = action_code;
 	m->u.action.u.wme_action.dialog_token = dialogue_token;
 	m->u.action.u.wme_action.status_code = status_code;

hostapd/wme.h

@@ -32,7 +32,6 @@
 #define WME_OUI_SUBTYPE_TSPEC_ELEMENT 2
 #define WME_VERSION 1
 
-#define WME_ACTION_CATEGORY 17
 #define WME_ACTION_CODE_SETUP_REQUEST 0
 #define WME_ACTION_CODE_SETUP_RESPONSE 1
 #define WME_ACTION_CODE_TEARDOWN 2

src/common/ieee802_11_defs.h

@@ -217,6 +217,7 @@
 #define WLAN_ACTION_RADIO_MEASUREMENT 5
 #define WLAN_ACTION_FT 6
 #define WLAN_ACTION_PING 8
+#define WLAN_ACTION_WMM 17
 
 /* Ping Action frame (IEEE 802.11w/D6.0, 7.4.9) */
 #define WLAN_PING_REQUEST 0