diff options
| -rw-r--r-- | sys/net80211/ieee80211.c | 13 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_input.c | 8 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_output.c | 8 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_proto.c | 10 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_proto.h | 3 |
5 files changed, 22 insertions, 20 deletions
diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c index d5f10114bb5..b6b57da5359 100644 --- a/sys/net80211/ieee80211.c +++ b/sys/net80211/ieee80211.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211.c,v 1.19 2006/12/20 08:13:56 grange Exp $ */ +/* $OpenBSD: ieee80211.c,v 1.20 2006/12/25 19:24:26 reyk Exp $ */ /* $NetBSD: ieee80211.c,v 1.19 2004/06/06 05:45:29 dyoung Exp $ */ /*- @@ -78,17 +78,6 @@ struct ieee80211com_head ieee80211com_head = static void ieee80211_setbasicrates(struct ieee80211com *); -#if 0 -static const char *ieee80211_phymode_name[] = { - "auto", /* IEEE80211_MODE_AUTO */ - "11a", /* IEEE80211_MODE_11A */ - "11b", /* IEEE80211_MODE_11B */ - "11g", /* IEEE80211_MODE_11G */ - "FH", /* IEEE80211_MODE_FH */ - "turbo", /* IEEE80211_MODE_TURBO */ -}; -#endif - void ieee80211_ifattach(struct ifnet *ifp) { diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index f7c904ffbc1..b7a497dbae6 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -1,5 +1,5 @@ /* $NetBSD: ieee80211_input.c,v 1.24 2004/05/31 11:12:24 dyoung Exp $ */ -/* $OpenBSD: ieee80211_input.c,v 1.21 2006/08/29 18:10:34 damien Exp $ */ +/* $OpenBSD: ieee80211_input.c,v 1.22 2006/12/25 19:24:26 reyk Exp $ */ /*- * Copyright (c) 2001 Atsushi Onoe * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting @@ -402,11 +402,13 @@ ieee80211_input(struct ifnet *ifp, struct mbuf *m, struct ieee80211_node *ni, doprint += ieee80211_debug; #endif if (doprint) - printf("%s: received %s from %s rssi %d\n", + printf("%s: received %s from %s rssi %d mode %s\n", ifp->if_xname, ieee80211_mgt_subtype_name[subtype >> IEEE80211_FC0_SUBTYPE_SHIFT], - ether_sprintf(wh->i_addr2), rssi); + ether_sprintf(wh->i_addr2), rssi, + ieee80211_phymode_name[ieee80211_chan2mode(ic, + ic->ic_bss->ni_chan)]); } #if NBPFILTER > 0 if (ic->ic_rawbpf) diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c index 2965b623364..46efb330f64 100644 --- a/sys/net80211/ieee80211_output.c +++ b/sys/net80211/ieee80211_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_output.c,v 1.22 2006/11/03 19:02:08 damien Exp $ */ +/* $OpenBSD: ieee80211_output.c,v 1.23 2006/12/25 19:24:26 reyk Exp $ */ /* $NetBSD: ieee80211_output.c,v 1.13 2004/05/31 11:02:55 dyoung Exp $ */ /*- @@ -179,13 +179,15 @@ ieee80211_mgmt_output(struct ifnet *ifp, struct ieee80211_node *ni, #endif (type & IEEE80211_FC0_SUBTYPE_MASK) != IEEE80211_FC0_SUBTYPE_PROBE_RESP) - printf("%s: sending %s to %s on channel %u\n", + printf("%s: sending %s to %s on channel %u mode %s\n", ifp->if_xname, ieee80211_mgt_subtype_name[ (type & IEEE80211_FC0_SUBTYPE_MASK) >> IEEE80211_FC0_SUBTYPE_SHIFT], ether_sprintf(ni->ni_macaddr), - ieee80211_chan2ieee(ic, ni->ni_chan)); + ieee80211_chan2ieee(ic, ni->ni_chan), + ieee80211_phymode_name[ + ieee80211_chan2mode(ic, ni->ni_chan)]); } IF_ENQUEUE(&ic->ic_mgtq, m); diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c index b88c0d0675e..d68c49f6e37 100644 --- a/sys/net80211/ieee80211_proto.c +++ b/sys/net80211/ieee80211_proto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_proto.c,v 1.12 2006/08/29 17:56:32 damien Exp $ */ +/* $OpenBSD: ieee80211_proto.c,v 1.13 2006/12/25 19:24:27 reyk Exp $ */ /* $NetBSD: ieee80211_proto.c,v 1.8 2004/04/30 23:58:20 dyoung Exp $ */ /*- @@ -82,6 +82,14 @@ const char *ieee80211_state_name[IEEE80211_S_MAX] = { "ASSOC", /* IEEE80211_S_ASSOC */ "RUN" /* IEEE80211_S_RUN */ }; +const char *ieee80211_phymode_name[] = { + "auto", /* IEEE80211_MODE_AUTO */ + "11a", /* IEEE80211_MODE_11A */ + "11b", /* IEEE80211_MODE_11B */ + "11g", /* IEEE80211_MODE_11G */ + "fh", /* IEEE80211_MODE_FH */ + "turbo", /* IEEE80211_MODE_TURBO */ +}; static int ieee80211_newstate(struct ieee80211com *, enum ieee80211_state, int); diff --git a/sys/net80211/ieee80211_proto.h b/sys/net80211/ieee80211_proto.h index 10de5944d8d..065d814f593 100644 --- a/sys/net80211/ieee80211_proto.h +++ b/sys/net80211/ieee80211_proto.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_proto.h,v 1.10 2006/11/03 19:02:08 damien Exp $ */ +/* $OpenBSD: ieee80211_proto.h,v 1.11 2006/12/25 19:24:27 reyk Exp $ */ /* $NetBSD: ieee80211_proto.h,v 1.3 2003/10/13 04:23:56 dyoung Exp $ */ /*- @@ -54,6 +54,7 @@ enum ieee80211_state { ((*(_ic)->ic_send_mgmt)(_ic, _ni, _type, _arg)) extern const char *ieee80211_mgt_subtype_name[]; +extern const char *ieee80211_phymode_name[]; extern void ieee80211_proto_attach(struct ifnet *); extern void ieee80211_proto_detach(struct ifnet *); |