d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert OACTIVE part of r195845; instead fix the comment so it does not refer

Browse Source 
to the old hack removed in r193312

Approved by:	re (implicit)
This commit is contained in:
Sam Leffler 2009-07-24 15:37:02 +00:00
parent 2c4e7faeae
commit 8ed1835dea
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/net80211/ieee80211_output.c
View File

@ -382,10 +382,22 @@ ieee80211_output(struct ifnet *ifp, struct mbuf *m,
{
#define senderr(e) do { error = (e); goto bad;} while (0)
struct ieee80211_node *ni = NULL;
struct ieee80211vap *vap = ifp->if_softc;
struct ieee80211vap *vap;
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 can happen because a packet came down through
* ieee80211_start before the vap entered RUN state in
* which case it's 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.