From 0f87e47ac80029fd22e285b1fcf711bcda14e5bd Mon Sep 17 00:00:00 2001
From: Rui Paulo <rpaulo@gmail.com>
Date: Mon, 9 Nov 2009 23:46:44 +0000
Subject: [PATCH] --- yaml --- r: 171679 b: refs/heads/master c:
 095de01325962e7574d5793193c6f3ae9a175aab h: refs/heads/master i:   171677:
 66281b93a17febab4de6ecb4799bcc0063ae3f1e   171675:
 3eff2fd3ba2d5926a1b63b79f6595dfb9bc2a3da   171671:
 6b99e151e0c41109195b546329051bcc73a09227   171663:
 a0b0f5a5d36a01850ceb27fa54655804bbdea548   171647:
 7a3f93d764b4bc01a58ae2eda40f633989818c8e v: v3

---
 [refs]                         | 2 +-
 trunk/net/mac80211/mesh.h      | 1 +
 trunk/net/mac80211/mesh_hwmp.c | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a59415630546..3e45139fdb26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0938393f02c5a4db75a6e38ee31645c974169bb5
+refs/heads/master: 095de01325962e7574d5793193c6f3ae9a175aab
diff --git a/trunk/net/mac80211/mesh.h b/trunk/net/mac80211/mesh.h
index 536d5c07fd19..2fd3e200a063 100644
--- a/trunk/net/mac80211/mesh.h
+++ b/trunk/net/mac80211/mesh.h
@@ -208,6 +208,7 @@ struct mesh_rmc {
 /* Pending ANA approval */
 #define MESH_PLINK_CATEGORY	30
 #define MESH_PATH_SEL_CATEGORY	32
+#define MESH_PATH_SEL_ACTION	0
 
 /* Public interfaces */
 /* Various */
diff --git a/trunk/net/mac80211/mesh_hwmp.c b/trunk/net/mac80211/mesh_hwmp.c
index 29b82e98effa..c291cdb75317 100644
--- a/trunk/net/mac80211/mesh_hwmp.c
+++ b/trunk/net/mac80211/mesh_hwmp.c
@@ -105,7 +105,7 @@ static int mesh_path_sel_frame_tx(enum mpath_frame_type action, u8 flags,
 	memcpy(mgmt->sa, sdata->dev->dev_addr, ETH_ALEN);
 	/* BSSID is left zeroed, wildcard value */
 	mgmt->u.action.category = MESH_PATH_SEL_CATEGORY;
-	mgmt->u.action.u.mesh_action.action_code = action;
+	mgmt->u.action.u.mesh_action.action_code = MESH_PATH_SEL_ACTION;
 
 	switch (action) {
 	case MPATH_PREQ: