diff options
| author | Ben Pfaff <blp@nicira.com> | 2009-12-03 11:28:40 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2009-12-03 11:28:40 -0800 |
| commit | 7634353824f1631c3008dc43a4a1cc0aebff3caa (patch) | |
| tree | b6579ad23e786f6dc83c79536e9dc4c3c725eb13 /ofproto/netflow.c | |
| parent | ba54bf4f658658b95be19e6d5a37276a5f37d0b3 (diff) | |
| download | openvswitch-7634353824f1631c3008dc43a4a1cc0aebff3caa.tar.gz | |
vswitchd: Initial conversion to database-based configuration.
This has seen very little testing, so some features are almost certainly
busted. Port mirroring is not yet converted, so it will definitely not
work.
Diffstat (limited to 'ofproto/netflow.c')
| -rw-r--r-- | ofproto/netflow.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ofproto/netflow.c b/ofproto/netflow.c index 7c77c64ff..2c7ae9e43 100644 --- a/ofproto/netflow.c +++ b/ofproto/netflow.c @@ -20,7 +20,6 @@ #include <errno.h> #include <stdlib.h> #include <unistd.h> -#include "cfg.h" #include "collectors.h" #include "flow.h" #include "netflow.h" @@ -211,7 +210,7 @@ netflow_set_options(struct netflow *nf, collectors_create(&nf_options->collectors, 0, &nf->collectors); old_timeout = nf->active_timeout; - if (nf_options->active_timeout != -1) { + if (nf_options->active_timeout < 0) { nf->active_timeout = nf_options->active_timeout; } else { nf->active_timeout = ACTIVE_TIMEOUT_DEFAULT; |