34c34
< __FBSDID("$FreeBSD: head/sys/net80211/ieee80211_input.c 121179 2003-10-17 22:15:26Z sam $");
---
> __FBSDID("$FreeBSD: head/sys/net80211/ieee80211_input.c 121180 2003-10-17 23:15:30Z sam $");
115a116
> ic->ic_stats.is_rx_badversion++;
126a128
> /* XXX statistic */
129c131
< /* XXX statistic */
---
> ic->ic_stats.is_rx_tooshort++;
135a138
> /* not interested in */
139c142
< /* not interested in */
---
> ic->ic_stats.is_rx_wrongbss++;
155a159
> ic->ic_stats.is_rx_wrongbss++;
173a178
> ic->ic_stats.is_rx_dup++; /* XXX per-station stat */
183c188,189
< if (dir != IEEE80211_FC1_DIR_FROMDS)
---
> if (dir != IEEE80211_FC1_DIR_FROMDS) {
> ic->ic_stats.is_rx_wrongdir++;
184a191
> }
193a201
> ic->ic_stats.is_rx_mcastecho++;
199c207,208
< if (dir != IEEE80211_FC1_DIR_NODS)
---
> if (dir != IEEE80211_FC1_DIR_NODS) {
> ic->ic_stats.is_rx_wrongdir++;
200a210
> }
203c213,214
< if (dir != IEEE80211_FC1_DIR_TODS)
---
> if (dir != IEEE80211_FC1_DIR_TODS) {
> ic->ic_stats.is_rx_wrongdir++;
204a216
> }
217a230
> ic->ic_stats.is_rx_notassoc++;
227a241
> ic->ic_stats.is_rx_notassoc++;
237c251,252
< if (m == NULL)
---
> if (m == NULL) {
> ic->ic_stats.is_rx_wepfail++;
238a254
> }
240c256,257
< } else
---
> } else {
> ic->ic_stats.is_rx_nowep++;
241a259
> }
247c265,266
< if (m == NULL)
---
> if (m == NULL) {
> ic->ic_stats.is_rx_decap++;
248a268
> }
289c309,310
< if (dir != IEEE80211_FC1_DIR_NODS)
---
> if (dir != IEEE80211_FC1_DIR_NODS) {
> ic->ic_stats.is_rx_wrongdir++;
291c312,314
< if (ic->ic_opmode == IEEE80211_M_AHDEMO)
---
> }
> if (ic->ic_opmode == IEEE80211_M_AHDEMO) {
> ic->ic_stats.is_rx_ahdemo_mgt++;
292a316
> }
298c322,323
< subtype != IEEE80211_FC0_SUBTYPE_PROBE_RESP)
---
> subtype != IEEE80211_FC0_SUBTYPE_PROBE_RESP) {
> ic->ic_stats.is_rx_mgtdiscard++;
299a325
> }
302c328,329
< subtype == IEEE80211_FC0_SUBTYPE_BEACON)
---
> subtype == IEEE80211_FC0_SUBTYPE_BEACON) {
> ic->ic_stats.is_rx_mgtdiscard++;
303a331
> }
338a367
> ic->ic_stats.is_rx_ctl++;
477a507
> ic->ic_stats.is_rx_rstoobig++;
485d514
< /* XXX statistics */
491a521
> ic->ic_stats.is_rx_elem_missing++; \
499a530
> ic->ic_stats.is_rx_elem_toobig++; \
510a542
> ic->ic_stats.is_rx_elem_toosmall++; \
600a633
> ic->ic_stats.is_rx_elem_toobig++;
607a641
> ic->ic_stats.is_rx_elem_unknown++;
622a657
> ic->ic_stats.is_rx_badchan++;
637c672
< /* XXX statistic */
---
> ic->ic_stats.is_rx_chanmismatch++;
672c707,708
< if (ni == NULL)
---
> if (ni == NULL) {
> ic->ic_stats.is_rx_nodealloc++;
673a710
> }
743a781
> ic->ic_stats.is_rx_ssidmismatch++;
749c787,788
< if (ni == NULL)
---
> if (ni == NULL) {
> ic->ic_stats.is_rx_nodealloc++;
750a790
> }
794a835
> ic->ic_stats.is_rx_auth_unsupported++;
796a838,850
> if (ic->ic_state != IEEE80211_S_RUN) {
> IEEE80211_DPRINTF(("%s: discard auth from %s; "
> "state %u\n", __func__,
> ether_sprintf(wh->i_addr2), ic->ic_state));
> ic->ic_stats.is_rx_bad_auth++;
> break;
> }
> if (seq != (ic->ic_opmode == IEEE80211_M_STA ? 2 : 1)) {
> IEEE80211_DPRINTF(("%s: discard auth from %s; seq %u\n",
> __func__, ether_sprintf(wh->i_addr2), seq));
> ic->ic_stats.is_rx_bad_auth++;
> break;
> }
799,800d852
< if (ic->ic_state != IEEE80211_S_RUN || seq != 1)
< return;
810,811d861
< if (ic->ic_state != IEEE80211_S_RUN || seq != 1)
< return;
814c864,865
< if (ni == NULL)
---
> if (ni == NULL) {
> ic->ic_stats.is_rx_nodealloc++;
815a867
> }
832,833d883
< if (ic->ic_state != IEEE80211_S_AUTH || seq != 2)
< return;
840a891
> ic->ic_stats.is_rx_auth_fail++;
879a931
> ic->ic_stats.is_rx_assoc_bss++;
911a964
> ic->ic_stats.is_rx_ssidmismatch++;
923a977
> ic->ic_stats.is_rx_assoc_notauth++;
937a992
> ic->ic_stats.is_rx_assoc_capmismatch++;
948a1004
> ic->ic_stats.is_rx_assoc_norate++;
1005a1062
> ic->ic_stats.is_rx_auth_fail++;
1041a1099
> ic->ic_stats.is_rx_deauth++;
1070a1129
> ic->ic_stats.is_rx_disassoc++;
1093a1153
> ic->ic_stats.is_rx_badsubtype++;