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

o move inactivity-related debug msgs under IEEE80211_MSG_INACT

Browse Source 
o probe inactive neighbors in adhoc mode (they don't have an
  association id so previously were being timed out)

MFC after:	3 days
This commit is contained in:
Sam Leffler 2005-07-22 23:25:46 +00:00
parent 2fcb4181ad
commit f66d97f6bc
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/net80211/ieee80211_node.c
View File

@ -1378,7 +1378,10 @@ ieee80211_timeout_stations(struct ieee80211_node_table *nt)
struct ieee80211com *ic = nt->nt_ic; struct ieee80211com *ic = nt->nt_ic;
struct ieee80211_node *ni; struct ieee80211_node *ni;
u_int gen; u_int gen;
int isadhoc;
isadhoc = (ic->ic_opmode == IEEE80211_M_IBSS ||
ic->ic_opmode == IEEE80211_M_AHDEMO);
IEEE80211_SCAN_LOCK(nt); IEEE80211_SCAN_LOCK(nt);
gen = nt->nt_scangen++; gen = nt->nt_scangen++;
IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE,
@ -1414,7 +1417,7 @@ restart:
if (ni == ic->ic_bss) if (ni == ic->ic_bss)
continue; continue;
ni->ni_inact--; ni->ni_inact--;
if (ni->ni_associd != 0) { if (ni->ni_associd != 0 || isadhoc) {
/* /*
* Age frames on the power save queue. The * Age frames on the power save queue. The
* aging interval is 4 times the listen * aging interval is 4 times the listen
@ -1460,9 +1463,10 @@ IEEE80211_DPRINTF(ic, IEEE80211_MSG_POWER, "[%s] discard frame, age %u\n", ether
*/ */
if (0 < ni->ni_inact && if (0 < ni->ni_inact &&
ni->ni_inact <= ic->ic_inact_probe) { ni->ni_inact <= ic->ic_inact_probe) {
IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, IEEE80211_NOTE(ic,
"[%s] probe station due to inactivity\n", IEEE80211_MSG_INACT | IEEE80211_MSG_NODE,
ether_sprintf(ni->ni_macaddr)); ni, "%s",
"probe station due to inactivity");
IEEE80211_NODE_UNLOCK(nt); IEEE80211_NODE_UNLOCK(nt);
ieee80211_send_nulldata(ni); ieee80211_send_nulldata(ni);
/* XXX stat? */ /* XXX stat? */
@ -1470,10 +1474,10 @@ IEEE80211_DPRINTF(ic, IEEE80211_MSG_POWER, "[%s] discard frame, age %u\n", ether
} }
} }
if (ni->ni_inact <= 0) { if (ni->ni_inact <= 0) {
IEEE80211_DPRINTF(ic, IEEE80211_MSG_NODE, IEEE80211_NOTE(ic,
"[%s] station timed out due to inactivity " IEEE80211_MSG_INACT | IEEE80211_MSG_NODE, ni,
"(refcnt %u)\n", ether_sprintf(ni->ni_macaddr), "station timed out due to inactivity "
ieee80211_node_refcnt(ni)); "(refcnt %u)", ieee80211_node_refcnt(ni));
/* /*
* Send a deauthenticate frame and drop the station. * Send a deauthenticate frame and drop the station.
* This is somewhat complicated due to reference counts * This is somewhat complicated due to reference counts