From owner-svn-src-head@FreeBSD.ORG  Fri Jul 24 15:22:12 2009
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 EA982106566B;
	Fri, 24 Jul 2009 15:22:12 +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 D8A3D8FC28;
	Fri, 24 Jul 2009 15:22:12 +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 n6OFMCAo013695;
	Fri, 24 Jul 2009 15:22:12 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6OFMCCG013694;
	Fri, 24 Jul 2009 15:22:12 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200907241522.n6OFMCCG013694@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Fri, 24 Jul 2009 15:22:12 +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: r195845 - 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: Fri, 24 Jul 2009 15:22:13 -0000

Author: sam
Date: Fri Jul 24 15:22:12 2009
New Revision: 195845
URL: http://svn.freebsd.org/changeset/base/195845

Log:
  o kill old code no longer needed after r193312
  o count output packets+errors for frames sent through ieee80211_output
  
  Approved by:	re (kensmith)

Modified:
  head/sys/net80211/ieee80211_output.c

Modified: head/sys/net80211/ieee80211_output.c
==============================================================================
--- head/sys/net80211/ieee80211_output.c	Fri Jul 24 15:06:49 2009	(r195844)
+++ head/sys/net80211/ieee80211_output.c	Fri Jul 24 15:22:12 2009	(r195845)
@@ -382,23 +382,10 @@ ieee80211_output(struct ifnet *ifp, stru
 {
 #define senderr(e) do { error = (e); goto bad;} while (0)
 	struct ieee80211_node *ni = NULL;
-	struct ieee80211vap *vap;
+	struct ieee80211vap *vap = ifp->if_softc;
 	struct ieee80211_frame *wh;
 	int error;
 
-	if (ifp->if_drv_flags & IFF_DRV_OACTIVE) {
-		/*
-		 * Short-circuit requests if the vap is marked OACTIVE
-		 * as this is used when tearing down state to indicate
-		 * the vap may be gone.  This can also happen because a
-		 * packet came down through ieee80211_start before the
-		 * vap entered RUN state in which case it's also ok to
-		 * just drop the frame.  This should not be necessary
-		 * but callers of if_output don't check OACTIVE.
-		 */
-		senderr(ENETDOWN);
-	}
-	vap = ifp->if_softc;
 	/*
 	 * Hand to the 802.3 code if not tagged as
 	 * a raw 802.11 frame.
@@ -468,6 +455,7 @@ ieee80211_output(struct ifnet *ifp, stru
 	if (ieee80211_classify(ni, m))
 		senderr(EIO);		/* XXX */
 
+	ifp->if_opackets++;
 	IEEE80211_NODE_STAT(ni, tx_data);
 	if (IEEE80211_IS_MULTICAST(wh->i_addr1)) {
 		IEEE80211_NODE_STAT(ni, tx_mcast);
@@ -491,6 +479,7 @@ bad:
 		m_freem(m);
 	if (ni != NULL)
 		ieee80211_free_node(ni);
+	ifp->if_oerrors++;
 	return error;
 #undef senderr
 }