projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
flow: Take advantage of zero-padding in struct flow and flow_wildcards.
[openvswitch]
/
lib
/
timer.h
diff --git
a/lib/timer.h
b/lib/timer.h
index 2197f934869073814705a3a7e9bd20b40362d231..e9650ada9b46f07ff0e0595c562b202a4252c4de 100644
(file)
--- a/
lib/timer.h
+++ b/
lib/timer.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2011 Nicira
Networks
.
+ * Copyright (c) 2011 Nicira
, Inc
.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-57,18
+57,11
@@
timer_set_expired(struct timer *timer)
timer->t = LLONG_MIN;
}
timer->t = LLONG_MIN;
}
-/* True if 'timer' had (or will have) expired at 'time'. */
-static inline bool
-timer_expired_at(const struct timer *timer, long long int time)
-{
- return time >= timer->t;
-}
-
/* True if 'timer' has expired. */
static inline bool
timer_expired(const struct timer *timer)
{
/* True if 'timer' has expired. */
static inline bool
timer_expired(const struct timer *timer)
{
- return time
r_expired_at(timer, time_msec())
;
+ return time
_msec() >= timer->t
;
}
/* Returns ture if 'timer' will never expire. */
}
/* Returns ture if 'timer' will never expire. */