diff options
| author | sam <sam@FreeBSD.org> | 2007-09-05 21:31:32 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2007-09-05 21:31:32 +0000 |
| commit | 82a73bb56563ac476ef079169cb642990e0a1cc7 (patch) | |
| tree | c7c268164c82a154ffedc62c1299e8212a8aa455 /sys/net80211/ieee80211_proto.c | |
| parent | fd6b073d62a4ab2b7f54272df8821d91edb0465c (diff) | |
| download | FreeBSD-src-82a73bb56563ac476ef079169cb642990e0a1cc7.zip FreeBSD-src-82a73bb56563ac476ef079169cb642990e0a1cc7.tar.gz | |
o add 802.11 state machine states for DFS and client-side power save
o fixup drivers to ignore new states
Reviewed by: avatar (?)
Approved by: re (blanket wireless)
Diffstat (limited to 'sys/net80211/ieee80211_proto.c')
| -rw-r--r-- | sys/net80211/ieee80211_proto.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c index 4a2b8f9..dd7d478 100644 --- a/sys/net80211/ieee80211_proto.c +++ b/sys/net80211/ieee80211_proto.c @@ -78,7 +78,10 @@ const char *ieee80211_state_name[IEEE80211_S_MAX] = { "SCAN", /* IEEE80211_S_SCAN */ "AUTH", /* IEEE80211_S_AUTH */ "ASSOC", /* IEEE80211_S_ASSOC */ - "RUN" /* IEEE80211_S_RUN */ + "CAC", /* IEEE80211_S_CAC */ + "RUN", /* IEEE80211_S_RUN */ + "CSA", /* IEEE80211_S_CSA */ + "SLEEP", /* IEEE80211_S_SLEEP */ }; const char *ieee80211_wme_acnames[] = { "WME_AC_BE", @@ -1143,6 +1146,8 @@ ieee80211_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg break; case IEEE80211_S_AUTH: break; + default: + break; } if (ostate != IEEE80211_S_INIT) { /* NB: optimize INIT -> INIT case */ @@ -1215,6 +1220,8 @@ ieee80211_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg goto createibss; } break; + default: + break; } break; case IEEE80211_S_AUTH: @@ -1257,6 +1264,8 @@ ieee80211_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg break; } break; + default: + break; } break; case IEEE80211_S_ASSOC: @@ -1282,6 +1291,8 @@ ieee80211_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg IEEE80211_FC0_SUBTYPE_ASSOC_REQ, 0); } break; + default: + break; } break; case IEEE80211_S_RUN: @@ -1337,6 +1348,8 @@ ieee80211_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg } if_start(ifp); /* XXX not authorized yet */ break; + default: + break; } if (ostate != IEEE80211_S_RUN && ic->ic_opmode == IEEE80211_M_STA && @@ -1377,6 +1390,8 @@ ieee80211_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg callout_reset(&ic->ic_inact, IEEE80211_INACT_WAIT*hz, ieee80211_node_timeout, ic); break; + default: + break; } return 0; } |
