projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dpif-linux: Translate queues to priorities correctly.
[openvswitch]
/
ofproto
/
in-band.c
diff --git
a/ofproto/in-band.c
b/ofproto/in-band.c
index bf90273e132e4243ada5f0fbef1ff3fd2f8590a1..884cf1d26fb70e411803dc3b124c777e292d9325 100644
(file)
--- a/
ofproto/in-band.c
+++ b/
ofproto/in-band.c
@@
-19,6
+19,7
@@
#include <arpa/inet.h>
#include <errno.h>
#include <inttypes.h>
#include <arpa/inet.h>
#include <errno.h>
#include <inttypes.h>
+#include <sys/socket.h>
#include <net/if.h>
#include <string.h>
#include <stdlib.h>
#include <net/if.h>
#include <string.h>
#include <stdlib.h>
@@
-745,14
+746,9
@@
in_band_run(struct in_band *ib)
void
in_band_wait(struct in_band *in_band)
{
void
in_band_wait(struct in_band *in_band)
{
- time_t now = time_now();
- time_t wakeup
+ long long int wakeup
= MIN(in_band->next_remote_refresh, in_band->next_local_refresh);
= MIN(in_band->next_remote_refresh, in_band->next_local_refresh);
- if (wakeup > now) {
- poll_timer_wait((wakeup - now) * 1000);
- } else {
- poll_immediate_wake();
- }
+ poll_timer_wait_until(wakeup * 1000);
}
/* ofproto has flushed all flows from the flow table and it is calling us back
}
/* ofproto has flushed all flows from the flow table and it is calling us back