From owner-svn-src-projects@FreeBSD.ORG Thu May 14 10:43:00 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 026F3106564A; Thu, 14 May 2009 10:43:00 +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 E67778FC12; Thu, 14 May 2009 10:42:59 +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 n4EAgxBW088524; Thu, 14 May 2009 10:42:59 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4EAgxJI088523; Thu, 14 May 2009 10:42:59 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200905141042.n4EAgxJI088523@svn.freebsd.org> From: Rui Paulo Date: Thu, 14 May 2009 10:42:59 +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: r192091 - 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: Thu, 14 May 2009 10:43:00 -0000 Author: rpaulo Date: Thu May 14 10:42:59 2009 New Revision: 192091 URL: http://svn.freebsd.org/changeset/base/192091 Log: Use the same format string for debugging peering frames. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_output.c Modified: projects/mesh11s/sys/net80211/ieee80211_output.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_output.c Thu May 14 09:28:02 2009 (r192090) +++ projects/mesh11s/sys/net80211/ieee80211_output.c Thu May 14 10:42:59 2009 (r192091) @@ -677,7 +677,7 @@ ieee80211_send_action(struct ieee80211_n case IEEE80211_ACTION_MESHPEERING_OPEN: IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, ni, - "send PEER OPEN action: lid %x", args[0]); + "send PEER OPEN action: localid 0x%x", args[0]); ADDSHORT(frm, getcapinfo(vap, ni->ni_chan)); frm = ieee80211_add_rates(frm, rs); frm = ieee80211_add_xrates(frm, rs); @@ -702,8 +702,8 @@ ieee80211_send_action(struct ieee80211_n case IEEE80211_ACTION_MESHPEERING_CONFIRM: IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, ni, - "send PEER CONFIRM action: lid %x, pid %x", - args[0], args[1]); + "send PEER CONFIRM action: localid 0x%x, " + "peerid 0x%x", args[0], args[1]); ADDSHORT(frm, getcapinfo(vap, ni->ni_chan)); ADDSHORT(frm, 0); /* status code */ ADDSHORT(frm, 0); /* AID */ @@ -726,8 +726,8 @@ ieee80211_send_action(struct ieee80211_n case IEEE80211_ACTION_MESHPEERING_CLOSE: IEEE80211_NOTE(vap, IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, ni, - "sending PEER CLOSE action: localid %x peerid %x " - "reason %d", args[0], args[1], args[2]); + "sending PEER CLOSE action: localid 0x%x, " + "peerid 0x%x reason %d", args[0], args[1], args[2]); ADDSHORT(frm, args[2]); /* reason code */ frm = ieee80211_add_meshid(frm, vap); frm = ieee80211_add_meshpeer(frm,