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

set the mgt frame tx timer before dispatching the frame to the

Browse Source 
driver; this closes a race where a response could be processed
before the timer was started and cause a RUN->SCAN state change
when operating in station mode

Reviewed by:	avatar, dyoung
MFC after:	1 week
This commit is contained in:
Sam Leffler 2006-02-08 17:30:31 +00:00
parent be2a64bdfa
commit 6d049ab343
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/net80211/ieee80211_output.c
View File

@ -142,7 +142,7 @@ ieee80211_send_setup(struct ieee80211com *ic,
*/
static int
ieee80211_mgmt_output(struct ieee80211com *ic, struct ieee80211_node *ni,
struct mbuf *m, int type)
struct mbuf *m, int type, int timer)
{
struct ifnet *ifp = ic->ic_ifp;
struct ieee80211_frame *wh;
@ -192,7 +192,13 @@ ieee80211_mgmt_output(struct ieee80211com *ic, struct ieee80211_node *ni,
#endif
IEEE80211_NODE_STAT(ni, tx_mgmt);
IF_ENQUEUE(&ic->ic_mgtq, m);
ifp->if_timer = 1;
if (timer) {
/*
* Set the mgt frame timeout.
*/
ic->ic_mgt_timer = timer;
ifp->if_timer = 1;
}
if_start(ifp);
return 0;
}
@ -1366,12 +1372,8 @@ ieee80211_send_mgmt(struct ieee80211com *ic, struct ieee80211_node *ni,
senderr(EINVAL, is_tx_unknownmgt);
/* NOTREACHED */
}
ret = ieee80211_mgmt_output(ic, ni, m, type);
if (ret == 0) {
if (timer)
ic->ic_mgt_timer = timer;
} else {
ret = ieee80211_mgmt_output(ic, ni, m, type, timer);
if (ret != 0) {
bad:
ieee80211_free_node(ni);
}