diff options
| author | monthadar <monthadar@FreeBSD.org> | 2012-05-01 15:35:10 +0000 |
|---|---|---|
| committer | monthadar <monthadar@FreeBSD.org> | 2012-05-01 15:35:10 +0000 |
| commit | 3b1abc639022bf902ec77bd4657fd906ef5264c0 (patch) | |
| tree | 6f6e59012468c87510911a8571b7cbdd0e8be132 /sys/net80211/ieee80211_mesh.h | |
| parent | 6177587c4108e56c6ce847cc3d8493713a845ff6 (diff) | |
| download | FreeBSD-src-3b1abc639022bf902ec77bd4657fd906ef5264c0.zip FreeBSD-src-3b1abc639022bf902ec77bd4657fd906ef5264c0.tar.gz | |
Added Self-protected action category (including MPM).
* Added new action category IEEE80211_ACTION_CAT_SELF_PROT which is used by 11s
for Mesh Peering Management;
* Updated Self protected enum Action codes to start from 1 instead of 0
according to the standard spec;
* Removed old and wrong action categories IEEE80211_ACTION_CAT_MESHPEERING;
* Modified ieee80211_mesh.c and ieee80211_action.c to use the new action
category code;
* Added earlier verification code in ieee80211_input;
Approved by: adrian
Diffstat (limited to 'sys/net80211/ieee80211_mesh.h')
| -rw-r--r-- | sys/net80211/ieee80211_mesh.h | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/sys/net80211/ieee80211_mesh.h b/sys/net80211/ieee80211_mesh.h index 58d7608..56120df 100644 --- a/sys/net80211/ieee80211_mesh.h +++ b/sys/net80211/ieee80211_mesh.h @@ -149,13 +149,6 @@ struct ieee80211_meshpeer_ie { uint16_t peer_rcode; } __packed; -enum { - IEEE80211_MESH_PEER_LINK_OPEN = 0, - IEEE80211_MESH_PEER_LINK_CONFIRM = 1, - IEEE80211_MESH_PEER_LINK_CLOSE = 2, - /* values 3-255 are reserved */ -}; - /* Mesh Peering Management Protocol */ #define IEEE80211_MESH_PEER_PROTO_OUI 0x00, 0x0f, 0xac #define IEEE80211_MESH_PEER_PROTO_VALUE 0x2a @@ -331,9 +324,9 @@ struct ieee80211_meshpuc_ie { /* * 802.11s Action Frames + * XXX: these are wrong, and some of them should be + * under MESH category while PROXY is under MULTIHOP category. */ -#define IEEE80211_ACTION_CAT_MESHPEERING 30 /* XXX Linux */ -/* XXX: these need to be looked into */ #define IEEE80211_ACTION_CAT_INTERWORK 15 #define IEEE80211_ACTION_CAT_RESOURCE 16 #define IEEE80211_ACTION_CAT_PROXY 17 @@ -342,10 +335,11 @@ struct ieee80211_meshpuc_ie { * Mesh Peering Action codes. */ enum { - IEEE80211_ACTION_MESHPEERING_OPEN = 0, - IEEE80211_ACTION_MESHPEERING_CONFIRM = 1, - IEEE80211_ACTION_MESHPEERING_CLOSE = 2, - /* 3-255 reserved */ + /* 0 reserved */ + IEEE80211_ACTION_MESHPEERING_OPEN = 1, + IEEE80211_ACTION_MESHPEERING_CONFIRM = 2, + IEEE80211_ACTION_MESHPEERING_CLOSE = 3, + /* 4-255 reserved */ }; /* |
