diff options
| author | glebius <glebius@FreeBSD.org> | 2004-12-01 11:56:32 +0000 |
|---|---|---|
| committer | glebius <glebius@FreeBSD.org> | 2004-12-01 11:56:32 +0000 |
| commit | 0ee3c9a14806187ae7b21c6472acef229f787eec (patch) | |
| tree | 993048ef397a314598d7acf4cda3afeaf0b93717 /sys/netgraph/atm | |
| parent | 5951763807c9b6250b4836e194dfec959d4b5be6 (diff) | |
| download | FreeBSD-src-0ee3c9a14806187ae7b21c6472acef229f787eec.zip FreeBSD-src-0ee3c9a14806187ae7b21c6472acef229f787eec.tar.gz | |
Mechanically rename s/ng_timeout/ng_callout/g, s/ng_untimeout/ng_uncallout/g.
This is done to keep both versions in RELENG_5 and support both APIs.
Reviewed by: scottl
Approved by: julian (mentor), implicitly
Diffstat (limited to 'sys/netgraph/atm')
| -rw-r--r-- | sys/netgraph/atm/sscop/ng_sscop_cust.h | 4 | ||||
| -rw-r--r-- | sys/netgraph/atm/uni/ng_uni_cust.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/netgraph/atm/sscop/ng_sscop_cust.h b/sys/netgraph/atm/sscop/ng_sscop_cust.h index fd2a892..8086d48 100644 --- a/sys/netgraph/atm/sscop/ng_sscop_cust.h +++ b/sys/netgraph/atm/sscop/ng_sscop_cust.h @@ -108,11 +108,11 @@ typedef struct callout sscop_timer_t; #define TIMER_INIT(S, T) ng_callout_init(&(S)->t_##T) #define TIMER_STOP(S,T) do { \ - ng_untimeout(&(S)->t_##T, (S)->aarg); \ + ng_uncallout(&(S)->t_##T, (S)->aarg); \ } while (0) #define TIMER_RESTART(S, T) do { \ TIMER_STOP(S, T); \ - ng_timeout(&(S)->t_##T, (S)->aarg, NULL, \ + ng_callout(&(S)->t_##T, (S)->aarg, NULL, \ hz * (S)->timer##T / 1000, T##_func, (S), 0); \ } while (0) #define TIMER_ISACT(S, T) ((S)->t_##T.c_flags & (CALLOUT_PENDING)) diff --git a/sys/netgraph/atm/uni/ng_uni_cust.h b/sys/netgraph/atm/uni/ng_uni_cust.h index cff9dd9..445a8c2 100644 --- a/sys/netgraph/atm/uni/ng_uni_cust.h +++ b/sys/netgraph/atm/uni/ng_uni_cust.h @@ -85,13 +85,13 @@ struct uni_timer { #define _TIMER_INIT(X,T) ng_callout_init(&(X)->T.c) #define _TIMER_DESTROY(UNI,FIELD) _TIMER_STOP(UNI,FIELD) #define _TIMER_STOP(UNI,FIELD) do { \ - ng_untimeout(&FIELD.c, (UNI)->arg); \ + ng_uncallout(&FIELD.c, (UNI)->arg); \ } while (0) #define TIMER_ISACT(UNI,T) ((UNI)->T.c.c_flags & (CALLOUT_ACTIVE | \ CALLOUT_PENDING)) #define _TIMER_START(UNI,ARG,FIELD,DUE,FUNC) do { \ _TIMER_STOP(UNI, FIELD); \ - ng_timeout(&FIELD.c, (UNI)->arg, NULL, \ + ng_callout(&FIELD.c, (UNI)->arg, NULL, \ hz * (DUE) / 1000, FUNC, (ARG), 0); \ } while (0) |
