Date: Fri, 24 Jul 2009 15:22:12 +0000 (UTC) From: Sam Leffler <sam@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r195845 - head/sys/net80211 Message-ID: <200907241522.n6OFMCCG013694@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907241522.n6OFMCCG013694>