aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorRui Paulo <rpaulo@gmail.com>2009-11-09 18:46:44 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-11-11 15:23:58 -0500
commit095de01325962e7574d5793193c6f3ae9a175aab (patch)
tree9769c526809d8bd63533aeccbd96ae6e6e3e7874 /net
parent0938393f02c5a4db75a6e38ee31645c974169bb5 (diff)
mac80211: update the format of path selection frames
Update the format of path selection frames according to latest draft (3.03). Signed-off-by: Rui Paulo <rpaulo@gmail.com> Signed-off-by: Javier Cardona <javier@cozybit.com> Reviewed-by: Andrey Yurovsky <andrey@cozybit.com> Tested-by: Brian Cavagnolo <brian@cozybit.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/mesh.h1
-rw-r--r--net/mac80211/mesh_hwmp.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h
index 536d5c07fd19..2fd3e200a063 100644
--- a/net/mac80211/mesh.h
+++ b/net/mac80211/mesh.h
@@ -208,6 +208,7 @@ struct mesh_rmc {
208/* Pending ANA approval */ 208/* Pending ANA approval */
209#define MESH_PLINK_CATEGORY 30 209#define MESH_PLINK_CATEGORY 30
210#define MESH_PATH_SEL_CATEGORY 32 210#define MESH_PATH_SEL_CATEGORY 32
211#define MESH_PATH_SEL_ACTION 0
211 212
212/* Public interfaces */ 213/* Public interfaces */
213/* Various */ 214/* Various */
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index 29b82e98effa..c291cdb75317 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -105,7 +105,7 @@ static int mesh_path_sel_frame_tx(enum mpath_frame_type action, u8 flags,
105 memcpy(mgmt->sa, sdata->dev->dev_addr, ETH_ALEN); 105 memcpy(mgmt->sa, sdata->dev->dev_addr, ETH_ALEN);
106 /* BSSID is left zeroed, wildcard value */ 106 /* BSSID is left zeroed, wildcard value */
107 mgmt->u.action.category = MESH_PATH_SEL_CATEGORY; 107 mgmt->u.action.category = MESH_PATH_SEL_CATEGORY;
108 mgmt->u.action.u.mesh_action.action_code = action; 108 mgmt->u.action.u.mesh_action.action_code = MESH_PATH_SEL_ACTION;
109 109
110 switch (action) { 110 switch (action) {
111 case MPATH_PREQ: 111 case MPATH_PREQ: