From patchwork Mon Nov 9 23:46:48 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Paulo X-Patchwork-Id: 58896 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nA9NlW2N015212 for ; Mon, 9 Nov 2009 23:47:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755694AbZKIXrY (ORCPT ); Mon, 9 Nov 2009 18:47:24 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755704AbZKIXrY (ORCPT ); Mon, 9 Nov 2009 18:47:24 -0500 Received: from ey-out-2122.google.com ([74.125.78.24]:10530 "EHLO ey-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755682AbZKIXrW (ORCPT ); Mon, 9 Nov 2009 18:47:22 -0500 Received: by ey-out-2122.google.com with SMTP id 4so87857eyf.19 for ; Mon, 09 Nov 2009 15:47:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=0ZqL29HH9yTxxc4BQhst/JbvyHS+meFfnO+1vhwWX4Q=; b=iOopGEGpFdK7D7gImLbYLYfngsHEAgX38C9JgWch/+K/B96/SbejFMTOinD7Y+fMm6 n7+vUKk8QwMDap7S0lgv19yBbSBvEqdvx58uqSrPCm0+c4xBcWB/tiZdfI69FHGQ8DqR GK5Ut2H1PCqCeo6gS1vMKYs3kG9uO7FDU9eWY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=klsOlh3qz7Mtvt1fFpK+LqehyZ2agqteaX0+Odq+HxqP9HJBIwsLBFWmnw92yWK9Bd yArD57U93p+sRYjLs2ofC1NzYpPF+Af0LKBWxX65U7u/CVdE/lqyqU2gjBmTK/nmVVim ToW/avKCmpQA6sZ4hSCMHmseM3QflpX/7L8bU= Received: by 10.213.1.5 with SMTP id 5mr4137624ebd.21.1257810447623; Mon, 09 Nov 2009 15:47:27 -0800 (PST) Received: from localhost (bl5-227-167.dsl.telepac.pt [82.154.227.167]) by mx.google.com with ESMTPS id 24sm449307eyx.13.2009.11.09.15.47.26 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 09 Nov 2009 15:47:26 -0800 (PST) From: Rui Paulo To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, Johannes Berg , Rui Paulo , Javier Cardona Subject: [PATCH v2 10/20] mac80211: improve peer link management debugging Date: Mon, 9 Nov 2009 23:46:48 +0000 Message-Id: <1257810418-30075-11-git-send-email-rpaulo@gmail.com> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1257810418-30075-1-git-send-email-rpaulo@gmail.com> References: <1257810418-30075-1-git-send-email-rpaulo@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c index 8a54bc8..cf12f61 100644 --- a/net/mac80211/mesh_plink.c +++ b/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;