diff options
| author | Jarno Rajahalme <jrajahalme@nicira.com> | 2013-10-28 13:54:39 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2013-10-29 09:40:19 -0700 |
| commit | a66733a8bc1c42d92f498108d7e27987989dc206 (patch) | |
| tree | 94b0d6a06383a235d3109ba64bbaf2e7c8524476 /ofproto/netflow.c | |
| parent | 1591fe8ee5b0ac14b1223c35af95c4e6efa269be (diff) | |
| download | openvswitch-a66733a8bc1c42d92f498108d7e27987989dc206.tar.gz | |
Widen TCP flags handling.
Widen TCP flags handling from 7 bits (uint8_t) to 12 bits (uint16_t).
The kernel interface remains at 8 bits, which makes no functional
difference now, as none of the higher bits is currently of interest
to the userspace.
Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Diffstat (limited to 'ofproto/netflow.c')
| -rw-r--r-- | ofproto/netflow.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ofproto/netflow.c b/ofproto/netflow.c index 19ca80fc4..a094bac1e 100644 --- a/ofproto/netflow.c +++ b/ofproto/netflow.c @@ -123,7 +123,7 @@ gen_netflow_rec(struct netflow *nf, struct netflow_flow *nf_flow, nf_rec->src_port = expired->flow.tp_src; nf_rec->dst_port = expired->flow.tp_dst; } - nf_rec->tcp_flags = nf_flow->tcp_flags; + nf_rec->tcp_flags = (uint8_t)nf_flow->tcp_flags; nf_rec->ip_proto = expired->flow.nw_proto; nf_rec->ip_tos = expired->flow.nw_tos & IP_DSCP_MASK; @@ -302,7 +302,7 @@ netflow_flow_update_time(struct netflow *nf, struct netflow_flow *nf_flow, } void -netflow_flow_update_flags(struct netflow_flow *nf_flow, uint8_t tcp_flags) +netflow_flow_update_flags(struct netflow_flow *nf_flow, uint16_t tcp_flags) { nf_flow->tcp_flags |= tcp_flags; } |