From owner-svn-src-user@FreeBSD.ORG  Tue Apr 23 00:55:05 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 3051F5B8;
 Tue, 23 Apr 2013 00:55:05 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 23DAD104B;
 Tue, 23 Apr 2013 00:55:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3N0t5Lu078317;
 Tue, 23 Apr 2013 00:55:05 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3N0t52F078316;
 Tue, 23 Apr 2013 00:55:05 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201304230055.r3N0t52F078316@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Tue, 23 Apr 2013 00:55:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r249784 - user/adrian/net80211_tx/sys/net80211
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Apr 2013 00:55:05 -0000

Author: adrian
Date: Tue Apr 23 00:55:04 2013
New Revision: 249784
URL: http://svnweb.freebsd.org/changeset/base/249784

Log:
  For now, make sure this doesn't panic.   i'll figure out this bug later.

Modified:
  user/adrian/net80211_tx/sys/net80211/ieee80211_power.c

Modified: user/adrian/net80211_tx/sys/net80211/ieee80211_power.c
==============================================================================
--- user/adrian/net80211_tx/sys/net80211/ieee80211_power.c	Tue Apr 23 00:10:33 2013	(r249783)
+++ user/adrian/net80211_tx/sys/net80211/ieee80211_power.c	Tue Apr 23 00:55:04 2013	(r249784)
@@ -386,6 +386,19 @@ ieee80211_pwrsave(struct ieee80211_node 
 		qhead->tail->m_nextpkt = m;
 		age -= M_AGE_GET(qhead->head);
 	}
+
+	/*
+	 * There's an odd bug where age ends up being -ve;
+	 * the age calculation above returns '0' but the frame
+	 * on the queue head has an age of 1. So, clamp a negative
+	 * age to 0 here and figure this bug out later.
+	 *
+	 * The calc above returns 0 because the ni->ni_intval is 1,
+	 * so the calculation always returns 0.
+	 */
+	if (age < 0) {
+		age = 0;
+	}
 	KASSERT(age >= 0, ("age %d", age));
 	M_AGE_SET(m, age);
 	m->m_nextpkt = NULL;