From owner-svn-src-head@FreeBSD.ORG  Wed May 11 17:20:35 2011
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 C33CE1065670;
	Wed, 11 May 2011 17:20:35 +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 B44488FC21;
	Wed, 11 May 2011 17:20:35 +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 p4BHKZhb098903;
	Wed, 11 May 2011 17:20:35 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4BHKZt2098901;
	Wed, 11 May 2011 17:20:35 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201105111720.p4BHKZt2098901@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 11 May 2011 17:20:35 +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: r221782 - 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: Wed, 11 May 2011 17:20:35 -0000

Author: adrian
Date: Wed May 11 17:20:35 2011
New Revision: 221782
URL: http://svn.freebsd.org/changeset/base/221782

Log:
  Fix up the net80211 alq logging - this commit makes it usable.
  
  * revert a local path change that shouldn't have made it to the commit
  * fix some indenting/wrapping
  
  * Fix the ale data copy - i should be copying into the ale data pointer,
    not over the ale entry itself.

Modified:
  head/sys/net80211/ieee80211_alq.c

Modified: head/sys/net80211/ieee80211_alq.c
==============================================================================
--- head/sys/net80211/ieee80211_alq.c	Wed May 11 16:44:19 2011	(r221781)
+++ head/sys/net80211/ieee80211_alq.c	Wed May 11 17:20:35 2011	(r221782)
@@ -65,7 +65,7 @@ __FBSDID("$FreeBSD$");
 static struct alq *ieee80211_alq;
 static int ieee80211_alq_lost;
 static int ieee80211_alq_logged;
-static char ieee80211_alq_logfile[MAXPATHLEN] = "/mnt/tmp/net80211.log";
+static char ieee80211_alq_logfile[MAXPATHLEN] = "/tmp/net80211.log";
 static unsigned int ieee80211_alq_qsize = 64*1024;
 
 static int
@@ -84,7 +84,9 @@ ieee80211_alq_setlogging(int enable)
 		    sizeof (struct ieee80211_alq_rec),
 		    ieee80211_alq_qsize);
 		ieee80211_alq_lost = 0;
-		printf("net80211: logging to %s enabled\n", ieee80211_alq_logfile);
+		ieee80211_alq_logged = 0;
+		printf("net80211: logging to %s enabled; struct size %d bytes\n",
+		    ieee80211_alq_logfile, sizeof(struct ieee80211_alq_rec));
 	} else {
 		if (ieee80211_alq)
 			alq_close(ieee80211_alq);
@@ -143,7 +145,7 @@ ieee80211_alq_log(struct ieee80211vap *v
 	if (! ale)
 		return;
 
-	r = (struct ieee80211_alq_rec *) ale;
+	r = (struct ieee80211_alq_rec *) ale->ae_data;
 	r->r_timestamp = htonl(ticks);
 	r->r_version = 1;
 	r->r_wlan = htons(vap->iv_ifp->if_dunit);