From owner-svn-src-all@FreeBSD.ORG  Sun Jan  6 04:40:08 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 0CD91BEA;
 Sun,  6 Jan 2013 04:40:08 +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 F2B381D3;
 Sun,  6 Jan 2013 04:40:07 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r064e7D5098694;
 Sun, 6 Jan 2013 04:40:07 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r064e7vr098693;
 Sun, 6 Jan 2013 04:40:07 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201301060440.r064e7vr098693@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sun, 6 Jan 2013 04:40:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r245098 - head/sys/net80211
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Sun, 06 Jan 2013 04:40:08 -0000

Author: adrian
Date: Sun Jan  6 04:40:07 2013
New Revision: 245098
URL: http://svnweb.freebsd.org/changeset/base/245098

Log:
  Handle ps-poll data frame if_transmit() failure.
  
  If the data frame transmission failures, it may have a node reference
  that needs cleaning up.
  
  If the frame is marked as M_ENCAP then it should treat recvif as a node
  reference and clear it.
  
  Now - since the mbuf has been freed by calling if_transmit() (even on
  failure), the mbuf has to be treated as invalid.  Hence why the ifp is
  used.

Modified:
  head/sys/net80211/ieee80211_hostap.c

Modified: head/sys/net80211/ieee80211_hostap.c
==============================================================================
--- head/sys/net80211/ieee80211_hostap.c	Sun Jan  6 04:38:31 2013	(r245097)
+++ head/sys/net80211/ieee80211_hostap.c	Sun Jan  6 04:40:07 2013	(r245098)
@@ -2324,5 +2324,19 @@ ieee80211_recv_pspoll(struct ieee80211_n
 		ifp = vap->iv_ic->ic_ifp;
 	else
 		ifp = vap->iv_ifp;
-	(void) ifp->if_transmit(ifp, m);
+
+	/*
+	 * Free any node ref which this mbuf may have.
+	 *
+	 * Much like psq_mfree(), we assume that M_ENCAP nodes have
+	 * node references.
+	 */
+	if (ifp->if_transmit(ifp, m) != 0) {
+		/*
+		 * XXX m is invalid (freed) at this point, determine M_ENCAP
+		 * an alternate way.
+		 */
+		if (ifp == vap->iv_ic->ic_ifp)
+			ieee80211_free_node(ni);
+	}
 }