projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wifi: ieee80211: clean up public action codes
[carl9170fw.git]
/
include
/
linux
/
ieee80211.h
diff --git
a/include/linux/ieee80211.h
b/include/linux/ieee80211.h
index a85de3022f53bdc3347f49ec30fcde29fafd7f26..5c88243c7898ce53e8747bca37dc1441f0839a07 100644
(file)
--- a/
include/linux/ieee80211.h
+++ b/
include/linux/ieee80211.h
@@
-9,7
+9,7
@@
* Copyright (c) 2006, Michael Wu <flamingice@sourmilk.net>
* Copyright (c) 2013 - 2014 Intel Mobile Communications GmbH
* Copyright (c) 2016 - 2017 Intel Deutschland GmbH
* Copyright (c) 2006, Michael Wu <flamingice@sourmilk.net>
* Copyright (c) 2013 - 2014 Intel Mobile Communications GmbH
* Copyright (c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright (c) 2018 - 202
2
Intel Corporation
+ * Copyright (c) 2018 - 202
3
Intel Corporation
*/
#ifndef __LINUX_IEEE80211_H
*/
#ifndef __LINUX_IEEE80211_H
@@
-3575,11
+3575,6
@@
enum ieee80211_unprotected_wnm_actioncode {
WLAN_UNPROTECTED_WNM_ACTION_TIMING_MEASUREMENT_RESPONSE = 1,
};
WLAN_UNPROTECTED_WNM_ACTION_TIMING_MEASUREMENT_RESPONSE = 1,
};
-/* Public action codes */
-enum ieee80211_public_actioncode {
- WLAN_PUBLIC_ACTION_FTM_RESPONSE = 33,
-};
-
/* Security key length */
enum ieee80211_key_len {
WLAN_KEY_LEN_WEP40 = 5,
/* Security key length */
enum ieee80211_key_len {
WLAN_KEY_LEN_WEP40 = 5,
@@
-3671,7
+3666,7
@@
enum ieee80211_pub_actioncode {
WLAN_PUB_ACTION_NETWORK_CHANNEL_CONTROL = 30,
WLAN_PUB_ACTION_WHITE_SPACE_MAP_ANN = 31,
WLAN_PUB_ACTION_FTM_REQUEST = 32,
WLAN_PUB_ACTION_NETWORK_CHANNEL_CONTROL = 30,
WLAN_PUB_ACTION_WHITE_SPACE_MAP_ANN = 31,
WLAN_PUB_ACTION_FTM_REQUEST = 32,
- WLAN_PUB_ACTION_FTM = 33,
+ WLAN_PUB_ACTION_FTM
_RESPONSE
= 33,
WLAN_PUB_ACTION_FILS_DISCOVERY = 34,
};
WLAN_PUB_ACTION_FILS_DISCOVERY = 34,
};
@@
-4300,7
+4295,7
@@
static inline bool ieee80211_is_ftm(struct ieee80211_hdr *hdr, size_t len)
return false;
if (mgmt->u.action.u.ftm.action_code ==
return false;
if (mgmt->u.action.u.ftm.action_code ==
- WLAN_PUB
LIC
_ACTION_FTM_RESPONSE &&
+ WLAN_PUB_ACTION_FTM_RESPONSE &&
len >= offsetofend(typeof(*mgmt), u.action.u.ftm))
return true;
len >= offsetofend(typeof(*mgmt), u.action.u.ftm))
return true;