diff options
| author | Javier Cardona <javier@cozybit.com> | 2011-05-03 19:57:09 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-05-11 14:37:47 -0400 |
| commit | d3aaec8ab76c2d604c2ba7332e1338674607597b (patch) | |
| tree | 436851aa4210a3567642945831854142b4fa9cf6 /include/linux/ieee80211.h | |
| parent | 0778a6a3e56cabdc322755f97ad23ee67efad0f0 (diff) | |
mac80211: Drop MESH_PLINK category and use new ANA-approved MESH_ACTION
Note: This breaks compatibility with previous mesh protocol instances.
Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/linux/ieee80211.h')
| -rw-r--r-- | include/linux/ieee80211.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 79690b710665..ee1c96a866cc 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h | |||
| @@ -1261,9 +1261,8 @@ enum ieee80211_category { | |||
| 1261 | WLAN_CATEGORY_MULTIHOP_ACTION = 14, | 1261 | WLAN_CATEGORY_MULTIHOP_ACTION = 14, |
| 1262 | WLAN_CATEGORY_SELF_PROTECTED = 15, | 1262 | WLAN_CATEGORY_SELF_PROTECTED = 15, |
| 1263 | WLAN_CATEGORY_WMM = 17, | 1263 | WLAN_CATEGORY_WMM = 17, |
| 1264 | /* TODO: remove MESH_PLINK and MESH_PATH_SEL after */ | 1264 | /* TODO: remove MESH_PATH_SEL after mesh is updated |
| 1265 | /* mesh is updated to current 802.11s draft */ | 1265 | * to current 802.11s draft */ |
| 1266 | WLAN_CATEGORY_MESH_PLINK = 30, | ||
| 1267 | WLAN_CATEGORY_MESH_PATH_SEL = 32, | 1266 | WLAN_CATEGORY_MESH_PATH_SEL = 32, |
| 1268 | WLAN_CATEGORY_VENDOR_SPECIFIC_PROTECTED = 126, | 1267 | WLAN_CATEGORY_VENDOR_SPECIFIC_PROTECTED = 126, |
| 1269 | WLAN_CATEGORY_VENDOR_SPECIFIC = 127, | 1268 | WLAN_CATEGORY_VENDOR_SPECIFIC = 127, |