diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2007-06-16 18:36:02 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2007-06-16 18:36:02 +0000 |
| commit | e8e668d26c79d9ce4efc2eaf3d15d53192547e48 (patch) | |
| tree | 2cb9a6f5cef3ba6b24a3b6918cf4d614d9aa5252 | |
| parent | bb36de4c6aee5a60f97396bbb6adf9b7a80c214a (diff) | |
move global declaration of ieee80211_merge_print_intvl into the only
function that uses it.
| -rw-r--r-- | sys/net80211/ieee80211_input.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index ee765768eba..e232d4de187 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.26 2007/06/16 13:17:05 damien Exp $ */ +/* $OpenBSD: ieee80211_input.c,v 1.27 2007/06/16 18:36:01 damien Exp $ */ /*- * Copyright (c) 2001 Atsushi Onoe * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting @@ -62,11 +62,6 @@ #include <dev/rndvar.h> -const struct timeval ieee80211_merge_print_intvl = { - .tv_sec = 1, - .tv_usec = 0 -}; - int ieee80211_setup_rates(struct ieee80211com *, struct ieee80211_node *, const u_int8_t *, const u_int8_t *, int); @@ -1634,10 +1629,13 @@ ieee80211_recv_pspoll(struct ieee80211com *ic, struct mbuf *m0, int rssi, int ieee80211_do_slow_print(struct ieee80211com *ic, int *did_print) { + static const struct timeval merge_print_intvl = { + .tv_sec = 1, .tv_usec = 0 + }; if ((ic->ic_if.if_flags & IFF_LINK0) == 0) return 0; if (!*did_print && (ic->ic_if.if_flags & IFF_DEBUG) == 0 && - !ratecheck(&ic->ic_last_merge_print, &ieee80211_merge_print_intvl)) + !ratecheck(&ic->ic_last_merge_print, &merge_print_intvl)) return 0; *did_print = 1; |