From: Jesse Gross <jesse@nicira.com>
Date: Wed, 27 Jan 2010 20:08:02 +0000 (-0500)
Subject: bridge: Properly read NetFlow parameters.
X-Git-Tag: v1.0.0~259^2~244
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=cd746526ab058dcf46bd5f72fb242db4bb61707a;p=sliver-openvswitch.git

bridge: Properly read NetFlow parameters.

When reading the NetFlow engine type and ID from the config database
we weren't dereferencing the variables.
---

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index a09f34357..726d759be 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -699,10 +699,10 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg)
 
             dpif_get_netflow_ids(br->dpif, &opts.engine_type, &opts.engine_id);
             if (nf_cfg->engine_type) {
-                opts.engine_type = nf_cfg->engine_type;
+                opts.engine_type = *nf_cfg->engine_type;
             }
             if (nf_cfg->engine_id) {
-                opts.engine_id = nf_cfg->engine_id;
+                opts.engine_id = *nf_cfg->engine_id;
             }
 
             opts.active_timeout = nf_cfg->active_timeout;