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

Fix wtap to not panic in wtap_beacon_intrp.

Browse Source 
* Changed KASSERT to be debug printf (DWTAP_PRINTF). If state is not
IEEE80211_S_RUN we return without scheduling a new callout;
* When net80211 stack changes state to IEEE802_11_INIT we stop the
beacon callout task;
This commit is contained in:
Monthadar Al Jaberi 2012-07-31 07:22:50 +00:00
parent d198a63d44
commit a574db0838
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/wtap/if_wtap.c
View File

@ -230,8 +230,10 @@ wtap_beacon_intrp(void *arg)
struct ieee80211vap *vap = arg;
struct mbuf *m;
KASSERT(vap->iv_state >= IEEE80211_S_RUN,
("not running, state %d", vap->iv_state));
if (vap->iv_state < IEEE80211_S_RUN) {
DWTAP_PRINTF("Skip beacon, not running, state %d", vap->iv_state);
return ;
}
DWTAP_PRINTF("[%d] beacon intrp\n", avp->id); //burst mode
/*
* Update dynamic beacon contents. If this returns
@ -289,6 +291,8 @@ wtap_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
default:
goto bad;
}
} else if (nstate == IEEE80211_S_INIT) {
callout_stop(&avp->av_swba);
}
return 0;
bad: