From owner-svn-src-all@FreeBSD.ORG  Wed May 11 16:44:19 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BB1CD1065674;
	Wed, 11 May 2011 16:44:19 +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 9192D8FC16;
	Wed, 11 May 2011 16:44:19 +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 p4BGiJaY097790;
	Wed, 11 May 2011 16:44:19 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4BGiJ5f097788;
	Wed, 11 May 2011 16:44:19 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201105111644.p4BGiJ5f097788@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 11 May 2011 16:44:19 +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: r221781 - head/sys/net80211
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 May 2011 16:44:19 -0000

Author: adrian
Date: Wed May 11 16:44:19 2011
New Revision: 221781
URL: http://svn.freebsd.org/changeset/base/221781

Log:
  net80211 alq bugfixes:
  
  * Track number of logged operations
  * call alq_post() so things are logged
  * network order things

Modified:
  head/sys/net80211/ieee80211_alq.c

Modified: head/sys/net80211/ieee80211_alq.c
==============================================================================
--- head/sys/net80211/ieee80211_alq.c	Wed May 11 15:23:27 2011	(r221780)
+++ head/sys/net80211/ieee80211_alq.c	Wed May 11 16:44:19 2011	(r221781)
@@ -64,7 +64,8 @@ __FBSDID("$FreeBSD$");
 
 static struct alq *ieee80211_alq;
 static int ieee80211_alq_lost;
-static char ieee80211_alq_logfile[MAXPATHLEN] = "/tmp/net80211.log";
+static int ieee80211_alq_logged;
+static char ieee80211_alq_logfile[MAXPATHLEN] = "/mnt/tmp/net80211.log";
 static unsigned int ieee80211_alq_qsize = 64*1024;
 
 static int
@@ -113,6 +114,8 @@ SYSCTL_INT(_net_wlan, OID_AUTO, alq_size
 	&ieee80211_alq_qsize, 0, "In-memory log size (#records)");
 SYSCTL_INT(_net_wlan, OID_AUTO, alq_lost, CTLFLAG_RW,
 	&ieee80211_alq_lost, 0, "Debugging operations not logged");
+SYSCTL_INT(_net_wlan, OID_AUTO, alq_logged, CTLFLAG_RW,
+	&ieee80211_alq_logged, 0, "Debugging operations logged");
 
 static struct ale *
 ieee80211_alq_get(void)
@@ -122,6 +125,8 @@ ieee80211_alq_get(void)
 	ale = alq_get(ieee80211_alq, ALQ_NOWAIT);
 	if (!ale)
 		ieee80211_alq_lost++;
+	else
+		ieee80211_alq_logged++;
 	return ale;
 }
 
@@ -131,14 +136,18 @@ ieee80211_alq_log(struct ieee80211vap *v
 	struct ale *ale;
 	struct ieee80211_alq_rec *r;
 
+	if (ieee80211_alq == NULL)
+		return;
+
 	ale = ieee80211_alq_get();
 	if (! ale)
 		return;
 
 	r = (struct ieee80211_alq_rec *) ale;
-	r->r_timestamp = ticks;
+	r->r_timestamp = htonl(ticks);
 	r->r_version = 1;
-	r->r_wlan = vap->iv_ifp->if_dunit;
+	r->r_wlan = htons(vap->iv_ifp->if_dunit);
 	r->r_op = op;
 	memcpy(&r->r_payload, p, MIN(l, sizeof(r->r_payload)));
+	alq_post(ieee80211_alq, ale);
 }