From: Thomas Pedersen Date: Fri, 12 Aug 2011 02:35:15 +0000 (-0700) Subject: mac80211: update mesh path selection frame format X-Git-Tag: 1.9.5~25 X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=766b248925547f3eb90bb34d206b7059ba275bd5;p=carl9170fw.git mac80211: update mesh path selection frame format Make mesh path selection frames Mesh Action category, remove outdated Mesh Path Selection category and defines, use updated reason codes, add mesh_action_is_path_sel for readability, and update/correct path selection IEs. Signed-off-by: Thomas Pedersen Signed-off-by: John W. Linville Signed-off-by: Christian Lamparter --- diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 589e857..7efc875 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h @@ -642,6 +642,7 @@ struct ieee80211_rann_ie { u8 rann_ttl; u8 rann_addr[6]; u32 rann_seq; + u32 rann_interval; u32 rann_metric; } __attribute__ ((packed)); @@ -1299,9 +1300,6 @@ enum ieee80211_category { WLAN_CATEGORY_MULTIHOP_ACTION = 14, WLAN_CATEGORY_SELF_PROTECTED = 15, WLAN_CATEGORY_WMM = 17, - /* TODO: remove MESH_PATH_SEL after mesh is updated - * to current 802.11s draft */ - WLAN_CATEGORY_MESH_PATH_SEL = 32, WLAN_CATEGORY_VENDOR_SPECIFIC_PROTECTED = 126, WLAN_CATEGORY_VENDOR_SPECIFIC = 127, };