projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto-sflow: Maintain table of ports even when clearing configuration.
[openvswitch]
/
lib
/
sflow_sampler.c
diff --git
a/lib/sflow_sampler.c
b/lib/sflow_sampler.c
index 759b5a22c7e95f53467ccd729125c4e6ca5f8d38..c2b4556cf6ee505ce242781abab64a05be6420a6 100644
(file)
--- a/
lib/sflow_sampler.c
+++ b/
lib/sflow_sampler.c
@@
-16,14
+16,17
@@
void sfl_sampler_init(SFLSampler *sampler, SFLAgent *agent, SFLDataSource_instan
SFLDataSource_instance dsi = *pdsi;
/* preserve the *nxt pointer too, in case we are resetting this poller and it is
SFLDataSource_instance dsi = *pdsi;
/* preserve the *nxt pointer too, in case we are resetting this poller and it is
- already part of the agent's linked list (thanks to Matt Woodly for pointing this out) */
+ already part of the agent's linked list (thanks to Matt Woodly for pointing this out,
+ and to Andy Kitchingman for pointing out that it applies to the hash_nxt ptr too) */
SFLSampler *nxtPtr = sampler->nxt;
SFLSampler *nxtPtr = sampler->nxt;
+ SFLSampler *hashPtr = sampler->hash_nxt;
/* clear everything */
memset(sampler, 0, sizeof(*sampler));
/* clear everything */
memset(sampler, 0, sizeof(*sampler));
- /* restore the linked list ptr */
+ /* restore the linked list
and hash-table
ptr */
sampler->nxt = nxtPtr;
sampler->nxt = nxtPtr;
+ sampler->hash_nxt = hashPtr;
/* now copy in the parameters */
sampler->agent = agent;
/* now copy in the parameters */
sampler->agent = agent;