From owner-svn-src-head@FreeBSD.ORG Fri Jul 10 02:19:57 2009 Return-Path: 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 E53EF106564A; Fri, 10 Jul 2009 02:19:57 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D44238FC16; Fri, 10 Jul 2009 02:19:57 +0000 (UTC) (envelope-from sam@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 n6A2JvxA004315; Fri, 10 Jul 2009 02:19:57 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6A2JvdC004313; Fri, 10 Jul 2009 02:19:57 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200907100219.n6A2JvdC004313@svn.freebsd.org> From: Sam Leffler Date: Fri, 10 Jul 2009 02:19:57 +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: r195527 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jul 2009 02:19:58 -0000 Author: sam Date: Fri Jul 10 02:19:57 2009 New Revision: 195527 URL: http://svn.freebsd.org/changeset/base/195527 Log: correctly set the tailq ptr when removing the last item in the q Approved by: re (kensmith) Modified: head/sys/net80211/ieee80211_ageq.c Modified: head/sys/net80211/ieee80211_ageq.c ============================================================================== --- head/sys/net80211/ieee80211_ageq.c Fri Jul 10 02:15:59 2009 (r195526) +++ head/sys/net80211/ieee80211_ageq.c Fri Jul 10 02:19:57 2009 (r195527) @@ -211,7 +211,6 @@ ieee80211_ageq_remove(struct ieee80211_a /* * Remove from forward list; tail pointer is harder. */ - *prev = m->m_nextpkt; if (aq->aq_tail == m) { KASSERT(m->m_nextpkt == NULL, ("not last")); if (aq->aq_head == m) { /* list empty */ @@ -223,6 +222,8 @@ ieee80211_ageq_remove(struct ieee80211_a offsetof(struct mbuf, m_nextpkt)); } } + *prev = m->m_nextpkt; + /* add to private list for return */ *phead = m; phead = &m->m_nextpkt;