diff options
| author | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2011-03-04 23:48:16 +0000 |
|---|---|---|
| committer | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2011-03-04 23:48:16 +0000 |
| commit | b39c826407790f794405d8a0a5060aa1b4ac7349 (patch) | |
| tree | 38fe13e9c9571b5a53df245d8e0962dbf10c895a | |
| parent | 03936683f39530295504caacc7eb40399ca149e1 (diff) | |
kill is_rx_elem_unknown.
damien@ ok. ports checked by sthen@.
| -rw-r--r-- | sys/net80211/ieee80211_input.c | 13 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_ioctl.h | 3 | ||||
| -rw-r--r-- | usr.bin/netstat/net80211.c | 3 |
3 files changed, 3 insertions, 16 deletions
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index 8721ba587cd..9580bc342e8 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_input.c,v 1.117 2011/02/21 20:00:12 stsp Exp $ */ +/* $OpenBSD: ieee80211_input.c,v 1.118 2011/03/04 23:48:15 fgsch Exp $ */ /*- * Copyright (c) 2001 Atsushi Onoe @@ -1379,10 +1379,6 @@ ieee80211_recv_probe_resp(struct ieee80211com *ic, struct mbuf *m, } chan = frm[2]; break; - case IEEE80211_ELEMID_TIM: - break; - case IEEE80211_ELEMID_IBSSPARMS: - break; case IEEE80211_ELEMID_XRATES: xrates = frm; break; @@ -1399,8 +1395,6 @@ ieee80211_recv_probe_resp(struct ieee80211com *ic, struct mbuf *m, case IEEE80211_ELEMID_EDCAPARMS: edcaie = frm; break; - case IEEE80211_ELEMID_QOS_CAP: - break; #ifndef IEEE80211_NO_HT case IEEE80211_ELEMID_HTCAPS: htcaps = frm; @@ -1422,11 +1416,6 @@ ieee80211_recv_probe_resp(struct ieee80211com *ic, struct mbuf *m, wmmie = frm; } break; - default: - DPRINTF(("element id %u/len %u ignored\n", - frm[0], frm[1])); - ic->ic_stats.is_rx_elem_unknown++; - break; } frm += 2 + frm[1]; } diff --git a/sys/net80211/ieee80211_ioctl.h b/sys/net80211/ieee80211_ioctl.h index 3ffebcb7575..9f54aa509d4 100644 --- a/sys/net80211/ieee80211_ioctl.h +++ b/sys/net80211/ieee80211_ioctl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_ioctl.h,v 1.17 2009/02/15 08:34:36 damien Exp $ */ +/* $OpenBSD: ieee80211_ioctl.h,v 1.18 2011/03/04 23:48:15 fgsch Exp $ */ /* $NetBSD: ieee80211_ioctl.h,v 1.7 2004/04/30 22:51:04 dyoung Exp $ */ /*- @@ -56,7 +56,6 @@ struct ieee80211_stats { u_int32_t is_rx_elem_missing; /* rx required element missing*/ u_int32_t is_rx_elem_toobig; /* rx element too big */ u_int32_t is_rx_elem_toosmall; /* rx element too small */ - u_int32_t is_rx_elem_unknown; /* rx element unknown */ u_int32_t is_rx_badchan; /* rx frame w/ invalid chan */ u_int32_t is_rx_chanmismatch; /* rx frame chan mismatch */ u_int32_t is_rx_nodealloc; /* rx frame dropped */ diff --git a/usr.bin/netstat/net80211.c b/usr.bin/netstat/net80211.c index 4bcfdd9f991..4b3e9dad821 100644 --- a/usr.bin/netstat/net80211.c +++ b/usr.bin/netstat/net80211.c @@ -1,4 +1,4 @@ -/* $OpenBSD: net80211.c,v 1.6 2008/12/17 19:27:40 jcs Exp $ */ +/* $OpenBSD: net80211.c,v 1.7 2011/03/04 23:48:15 fgsch Exp $ */ /* * Copyright (c) 2005 Reyk Floeter <reyk@openbsd.org> @@ -78,7 +78,6 @@ net80211_ifstats(char *ifname) p(is_rx_elem_missing, "\t%lu input packet%s with missing elements\n"); p(is_rx_elem_toobig, "\t%lu input packet%s with elements too big\n"); p(is_rx_elem_toosmall, "\t%lu input packet%s with elements too small\n"); - p(is_rx_elem_unknown, "\t%lu input packet%s with unknown elements\n"); p(is_rx_badchan, "\t%lu input packet%s with invalid channel\n"); p(is_rx_chanmismatch, "\t%lu input packet%s with mismatched channel\n"); p(is_rx_nodealloc, "\t%lu input packet%s dropped\n"); |