ofp-util: Work on decoding OF1.1 flow_mods.

[openvswitch] / lib / timer.c

diff --git a/lib/timer.c b/lib/timer.c
index b640a7be89f0bb2ca1dbf4cf5cd3d2dff4f3ade0..e767db65ff97ff2aff23f45c5d0e1d22afa2e070 100644 (file)
--- a/lib/timer.c
+++ b/lib/timer.c
@@ -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.
@@ -34,9 +34,9 @@ timer_msecs_until_expired(const struct timer *timer)
 
 /* Causes poll_block() to wake when 'timer' expires. */
 void
-timer_wait(const struct timer *timer)
+(timer_wait)(const struct timer *timer, const char *where)
 {
     if (timer->t < LLONG_MAX) {
-        poll_timer_wait_until(timer->t);
+        (poll_timer_wait_until)(timer->t, where);
     }
 }