From owner-svn-src-head@FreeBSD.ORG  Tue Mar 27 04:15:39 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A79B81065672;
	Tue, 27 Mar 2012 04:15:39 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 929978FC0A;
	Tue, 27 Mar 2012 04:15:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2R4FdoE068558;
	Tue, 27 Mar 2012 04:15:39 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2R4FdL1068556;
	Tue, 27 Mar 2012 04:15:39 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201203270415.q2R4FdL1068556@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Tue, 27 Mar 2012 04:15:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233531 - head/sys/net80211
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Mar 2012 04:15:39 -0000

Author: adrian
Date: Tue Mar 27 04:15:38 2012
New Revision: 233531
URL: http://svn.freebsd.org/changeset/base/233531

Log:
  Correct the ordering of tid/crypto ic_name.
  
  Because the code lacks all the GNU extensions to printf() format stuff,
  the compiler doesn't helpfully tell us that I messed up in a previous
  commit.
  
  Pointy hat to: adrian, who likely only cares about this because he's the
    only one who bothers flipping on net80211 debugging.

Modified:
  head/sys/net80211/ieee80211_freebsd.c

Modified: head/sys/net80211/ieee80211_freebsd.c
==============================================================================
--- head/sys/net80211/ieee80211_freebsd.c	Tue Mar 27 01:26:00 2012	(r233530)
+++ head/sys/net80211/ieee80211_freebsd.c	Tue Mar 27 04:15:38 2012	(r233531)
@@ -572,7 +572,7 @@ ieee80211_notify_replay_failure(struct i
 
 	IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_CRYPTO, wh->i_addr2,
 	    "%s replay detected tid %d <rsc %ju, csc %ju, keyix %u rxkeyix %u>",
-	    tid, k->wk_cipher->ic_name, (intmax_t) rsc,
+	    k->wk_cipher->ic_name, tid, (intmax_t) rsc,
 	    (intmax_t) k->wk_keyrsc[tid],
 	    k->wk_keyix, k->wk_rxkeyix);