From owner-svn-src-projects@FreeBSD.ORG Wed Jun 24 16:25:17 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E3FB01065674; Wed, 24 Jun 2009 16:25:17 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D24128FC0C; Wed, 24 Jun 2009 16:25:17 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5OGPHQL020311; Wed, 24 Jun 2009 16:25:17 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5OGPHT8020309; Wed, 24 Jun 2009 16:25:17 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200906241625.n5OGPHT8020309@svn.freebsd.org> From: Rui Paulo Date: Wed, 24 Jun 2009 16:25:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r194854 - projects/mesh11s/sys/net80211 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2009 16:25:18 -0000 Author: rpaulo Date: Wed Jun 24 16:25:17 2009 New Revision: 194854 URL: http://svn.freebsd.org/changeset/base/194854 Log: Now that we have the HWMP debugging bit, use it. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_hwmp.c Wed Jun 24 16:24:08 2009 (r194853) +++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c Wed Jun 24 16:25:17 2009 (r194854) @@ -274,7 +274,7 @@ ieee80211_hwmp_recv_action(struct ieee80 case IEEE80211_ACTION_MESHPATH_REQ: if (meshpreq == NULL) { IEEE80211_DISCARD(vap, - IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, + IEEE80211_MSG_ACTION | IEEE80211_MSG_HWMP, wh, NULL, "%s", "PREQ without IE"); vap->iv_stats.is_rx_mgtdiscard++; return; @@ -284,7 +284,7 @@ ieee80211_hwmp_recv_action(struct ieee80 case IEEE80211_ACTION_MESHPATH_REP: if (meshprep == NULL) { IEEE80211_DISCARD(vap, - IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, + IEEE80211_MSG_ACTION | IEEE80211_MSG_HWMP, wh, NULL, "%s", "PREP without IE"); vap->iv_stats.is_rx_mgtdiscard++; return; @@ -294,7 +294,7 @@ ieee80211_hwmp_recv_action(struct ieee80 case IEEE80211_ACTION_MESHPATH_ERR: if (meshperr == NULL) { IEEE80211_DISCARD(vap, - IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, + IEEE80211_MSG_ACTION | IEEE80211_MSG_HWMP, wh, NULL, "%s", "PERR without IE"); vap->iv_stats.is_rx_mgtdiscard++; return; @@ -304,7 +304,7 @@ ieee80211_hwmp_recv_action(struct ieee80 case IEEE80211_ACTION_MESHPATH_RANN: if (meshrann == NULL) { IEEE80211_DISCARD(vap, - IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, + IEEE80211_MSG_ACTION | IEEE80211_MSG_HWMP, wh, NULL, "%s", "RANN without IE"); vap->iv_stats.is_rx_mgtdiscard++; return; @@ -312,7 +312,7 @@ ieee80211_hwmp_recv_action(struct ieee80 hwmp_recv_rann(vap, ni, wh, meshrann); break; default: - IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_MESH, + IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_HWMP, ni->ni_macaddr, NULL, "unknown path action 0x%x", ia->ia_action); } @@ -523,7 +523,7 @@ hwmp_recv_preq(struct ieee80211vap *vap, if (IEEE80211_ADDR_EQ(vap->iv_myaddr, preq->preq_origaddr)) return; - IEEE80211_NOTE(vap, IEEE80211_MSG_MESH, ni, + IEEE80211_NOTE(vap, IEEE80211_MSG_HWMP, ni, "received PREQ, source %s", ether_sprintf(preq->preq_origaddr)); /* @@ -532,7 +532,7 @@ hwmp_recv_preq(struct ieee80211vap *vap, */ if (!IEEE80211_ADDR_EQ(vap->iv_myaddr, PREQ_TADDR(0)) && !(vap->iv_meshflags & IEEE80211_MFLAGS_FWRD)) { - IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_MESH, + IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_HWMP, preq->preq_origaddr, NULL, "%s", "not accepting PREQ"); return; } @@ -569,7 +569,7 @@ hwmp_recv_preq(struct ieee80211vap *vap, if (IEEE80211_ADDR_EQ(vap->iv_myaddr, PREQ_TADDR(0))) { struct ieee80211_meshprep_ie prep; - IEEE80211_NOTE(vap, IEEE80211_MSG_MESH, ni, + IEEE80211_NOTE(vap, IEEE80211_MSG_HWMP, ni, "replying to %s", ether_sprintf(preq->preq_origaddr)); /* * Build and send a PREP frame. @@ -612,7 +612,7 @@ hwmp_recv_preq(struct ieee80211vap *vap, if (fi != NULL && !IEEE80211_ADDR_EQ(fi->fi_nexthop, invalidaddr)) { - IEEE80211_NOTE(vap, IEEE80211_MSG_MESH, ni, + IEEE80211_NOTE(vap, IEEE80211_MSG_HWMP, ni, "forwarding PREQ from %s", ether_sprintf(preq->preq_origaddr)); /* @@ -637,7 +637,7 @@ hwmp_recv_preq(struct ieee80211vap *vap, if (!(PREQ_TFLAGS(0) & IEEE80211_MESHPREQ_TFLAGS_TO)) { struct ieee80211_meshprep_ie prep; - IEEE80211_NOTE(vap, IEEE80211_MSG_MESH, ni, + IEEE80211_NOTE(vap, IEEE80211_MSG_HWMP, ni, "intermediate reply for PREQ from %s", ether_sprintf(preq->preq_origaddr)); prep.prep_flags = 0; @@ -655,7 +655,7 @@ hwmp_recv_preq(struct ieee80211vap *vap, broadcastaddr, &prep); } } else { - IEEE80211_NOTE(vap, IEEE80211_MSG_MESH, ni, + IEEE80211_NOTE(vap, IEEE80211_MSG_HWMP, ni, "forwarding PREQ from %s", ether_sprintf(preq->preq_origaddr)); /* @@ -740,7 +740,7 @@ hwmp_recv_prep(struct ieee80211vap *vap, !(vap->iv_meshflags & IEEE80211_MFLAGS_FWRD)) return; - IEEE80211_NOTE(vap, IEEE80211_MSG_MESH, ni, + IEEE80211_NOTE(vap, IEEE80211_MSG_HWMP, ni, "received PREP from %s", ether_sprintf(prep->prep_origaddr)); HWMP_LOCK(hs); @@ -758,7 +758,7 @@ hwmp_recv_prep(struct ieee80211vap *vap, prep->prep_ttl > 1) { struct ieee80211_meshprep_ie pprep; /* propagated PREP */ - IEEE80211_NOTE(vap, IEEE80211_MSG_MESH, ni, + IEEE80211_NOTE(vap, IEEE80211_MSG_HWMP, ni, "propagating PREP from %s", ether_sprintf(prep->prep_origaddr)); @@ -1013,7 +1013,7 @@ ieee80211_hwmp_discover(struct ieee80211 unknowndst = 1; } if (sendpreq) { - IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_MESH, dest, + IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_HWMP, dest, "%s", "initiating path discovery"); /* * Try to discover the path for this node. @@ -1045,7 +1045,7 @@ ieee80211_hwmp_discover(struct ieee80211 if (!IEEE80211_ADDR_EQ(fi->fi_nexthop, invalidaddr)) return ieee80211_find_txnode(vap, fi->fi_nexthop); - IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_MESH, + IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_HWMP, dest, NULL, "%s", "no valid path to this node"); return NULL;