From d6f2ffbdc24cd4b4db1a57729e7e6bb429b5ca87 Mon Sep 17 00:00:00 2001
From: Rui Paulo <rpaulo@gmail.com>
Date: Mon, 9 Nov 2009 23:46:48 +0000
Subject: [PATCH] --- yaml --- r: 171683 b: refs/heads/master c:
 1460dd158a520447b87661aea4afda1997d69cde h: refs/heads/master i:   171681:
 9899fa2bc4352010cdebf73850a0e5556eca1f05   171679:
 0f87e47ac80029fd22e285b1fcf711bcda14e5bd v: v3

---
 [refs]                          |  2 +-
 trunk/net/mac80211/mesh_plink.c | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index baf033a94816..da18e8800f0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3c0d88a7fc1c3fff84ac57d3f3195d0dd1854ac
+refs/heads/master: 1460dd158a520447b87661aea4afda1997d69cde
diff --git a/trunk/net/mac80211/mesh_plink.c b/trunk/net/mac80211/mesh_plink.c
index 8a54bc836c92..cf12f616c5b1 100644
--- a/trunk/net/mac80211/mesh_plink.c
+++ b/trunk/net/mac80211/mesh_plink.c
@@ -398,6 +398,17 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
 	u8 ie_len;
 	u8 *baseaddr;
 	__le16 plid, llid, reason;
+#ifdef CONFIG_MAC80211_VERBOSE_MPL_DEBUG
+	static const char *mplstates[] = {
+		[PLINK_LISTEN] = "LISTEN",
+		[PLINK_OPN_SNT] = "OPN-SNT",
+		[PLINK_OPN_RCVD] = "OPN-RCVD",
+		[PLINK_CNF_RCVD] = "CNF_RCVD",
+		[PLINK_ESTAB] = "ESTAB",
+		[PLINK_HOLDING] = "HOLDING",
+		[PLINK_BLOCKED] = "BLOCKED"
+	};
+#endif
 
 	/* need action_code, aux */
 	if (len < IEEE80211_MIN_ACTION_SIZE + 3)
@@ -536,8 +547,8 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
 		}
 	}
 
-	mpl_dbg("Mesh plink (peer, state, llid, plid, event): %pM %d %d %d %d\n",
-		mgmt->sa, sta->plink_state,
+	mpl_dbg("Mesh plink (peer, state, llid, plid, event): %pM %s %d %d %d\n",
+		mgmt->sa, mplstates[sta->plink_state],
 		le16_to_cpu(sta->llid), le16_to_cpu(sta->plid),
 		event);
 	reason = 0;