diff options
author | rpaulo <rpaulo@FreeBSD.org> | 2009-09-22 18:18:14 +0000 |
---|---|---|
committer | rpaulo <rpaulo@FreeBSD.org> | 2009-09-22 18:18:14 +0000 |
commit | f41eff35afdb5ab46bb938d7431c53189a3acc11 (patch) | |
tree | b521e4da0c21aa67b0ef9bb06efb6963483d2471 /sys/net80211/ieee80211.h | |
parent | 4d7a22b3ee59df2ae3754ffbc60d313ec316697a (diff) | |
download | FreeBSD-src-f41eff35afdb5ab46bb938d7431c53189a3acc11.zip FreeBSD-src-f41eff35afdb5ab46bb938d7431c53189a3acc11.tar.gz |
Update 802.11s mesh support to draft 3.03. This includes a revised frame
format for peering and changes to the PERR frames.
Note that this is incompatible with the previous code.
Reviewed by: sam
MFC after: 1 week
Diffstat (limited to 'sys/net80211/ieee80211.h')
-rw-r--r-- | sys/net80211/ieee80211.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/net80211/ieee80211.h b/sys/net80211/ieee80211.h index 5ddca24..712c2a8 100644 --- a/sys/net80211/ieee80211.h +++ b/sys/net80211/ieee80211.h @@ -708,7 +708,7 @@ enum { IEEE80211_ELEMID_VENDOR = 221, /* vendor private */ /* - * 802.11s IEs based on D3.0 spec and were not assigned by + * 802.11s IEs based on D3.03 spec and were not assigned by * ANA. Beware changing them because some of them are being * kept compatible with Linux. */ @@ -726,10 +726,9 @@ enum { IEEE80211_ELEMID_MESHPREQ = 68, IEEE80211_ELEMID_MESHPREP = 69, IEEE80211_ELEMID_MESHPERR = 70, - IEEE80211_ELEMID_MESHPU = 53, - IEEE80211_ELEMID_MESHPUC = 54, + IEEE80211_ELEMID_MESHPXU = 53, + IEEE80211_ELEMID_MESHPXUC = 54, IEEE80211_ELEMID_MESHAH = 60, /* Abbreviated Handshake */ - IEEE80211_ELEMID_MESHPEERVER = 80, /* Peering Protocol Version */ }; struct ieee80211_tim_ie { @@ -925,6 +924,9 @@ enum { IEEE80211_REASON_MESH_INVALID_GTK = 8, /* 11s */ IEEE80211_REASON_MESH_INCONS_PARAMS = 9, /* 11s */ IEEE80211_REASON_MESH_INVALID_SECURITY = 10, /* 11s */ + IEEE80211_REASON_MESH_PERR_UNSPEC = 11, /* 11s */ + IEEE80211_REASON_MESH_PERR_NO_FI = 12, /* 11s */ + IEEE80211_REASON_MESH_PERR_DEST_UNREACH = 13, /* 11s */ IEEE80211_STATUS_SUCCESS = 0, IEEE80211_STATUS_UNSPECIFIED = 1, |