diff options
author | Pravin B Shelar <pshelar@nicira.com> | 2015-03-02 17:29:44 -0800 |
---|---|---|
committer | Pravin B Shelar <pshelar@nicira.com> | 2015-03-03 13:37:39 -0800 |
commit | 6fd6ed71cb9f2dba8307da371d5e86c34695783c (patch) | |
tree | f531082ec70f33a24c7d7e62c615d8234a0145f3 /ofproto/netflow.c | |
parent | cf62fa4c7074121184a1f1d07980990113657612 (diff) | |
download | openvswitch-6fd6ed71cb9f2dba8307da371d5e86c34695783c.tar.gz |
ofpbuf: Simplify ofpbuf API.
ofpbuf was complicated due to its wide usage across all
layers of OVS, Now we have introduced independent dp_packet
which can be used for datapath packet, we can simplify ofpbuf.
Following patch removes DPDK mbuf and access API of ofpbuf
members.
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'ofproto/netflow.c')
-rw-r--r-- | ofproto/netflow.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ofproto/netflow.c b/ofproto/netflow.c index 99bd6b8e4..0470443bb 100644 --- a/ofproto/netflow.c +++ b/ofproto/netflow.c @@ -110,7 +110,7 @@ gen_netflow_rec(struct netflow *nf, struct netflow_flow *nf_flow, struct netflow_v5_header *nf_hdr; struct netflow_v5_record *nf_rec; - if (!ofpbuf_size(&nf->packet)) { + if (!nf->packet.size) { struct timespec now; time_wall_timespec(&now); @@ -126,7 +126,7 @@ gen_netflow_rec(struct netflow *nf, struct netflow_flow *nf_flow, nf_hdr->sampling_interval = htons(0); } - nf_hdr = ofpbuf_data(&nf->packet); + nf_hdr = nf->packet.data; nf_hdr->count = htons(ntohs(nf_hdr->count) + 1); nf_hdr->flow_seq = htonl(nf->netflow_cnt++); @@ -298,9 +298,9 @@ netflow_run__(struct netflow *nf) OVS_REQUIRES(mutex) long long int now = time_msec(); struct netflow_flow *nf_flow, *next; - if (ofpbuf_size(&nf->packet)) { - collectors_send(nf->collectors, ofpbuf_data(&nf->packet), ofpbuf_size(&nf->packet)); - ofpbuf_set_size(&nf->packet, 0); + if (nf->packet.size) { + collectors_send(nf->collectors, nf->packet.data, nf->packet.size); + nf->packet.size = 0; } if (!nf->active_timeout || now < nf->next_timeout) { @@ -339,7 +339,7 @@ netflow_wait(struct netflow *nf) OVS_EXCLUDED(mutex) if (nf->active_timeout) { poll_timer_wait_until(nf->next_timeout); } - if (ofpbuf_size(&nf->packet)) { + if (nf->packet.size) { poll_immediate_wake(); } ovs_mutex_unlock(&mutex); |