diff options
| author | Ben Pfaff <blp@nicira.com> | 2010-07-27 10:02:07 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2010-08-02 20:16:32 -0700 |
| commit | abfec865566e6cce961cc8660de1ddfdc85dae5f (patch) | |
| tree | 1c791f895eed3943bb0a9b04ec074449784e9234 /ofproto/netflow.h | |
| parent | 8084a2800f82c6d0ec438cb8f2de24518af2c712 (diff) | |
| download | openvswitch-abfec865566e6cce961cc8660de1ddfdc85dae5f.tar.gz | |
datapath: Don't track IP TOS value two different ways.
Originally, the datapath didn't care about IP TOS at all. Then, to support
NetFlow, we made it keep track of the last-seen IP TOS value on a per-flow
basis. Then, to support OpenFlow 1.0, we added a nw_tos field to
odp_flow_key. We don't need both methods, so this commit drops the
NetFlow-specific tracking.
This introduces a small kernel ABI break: upgrading the kernel module
without upgrading the OVS userspace will mean that NetFlow records will
all show an IP TOS value of 0. I don't consider that to be a serious
problem.
Diffstat (limited to 'ofproto/netflow.h')
| -rw-r--r-- | ofproto/netflow.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ofproto/netflow.h b/ofproto/netflow.h index f3099a184..f6fad62b0 100644 --- a/ofproto/netflow.h +++ b/ofproto/netflow.h @@ -52,7 +52,6 @@ struct netflow_flow { uint64_t byte_count_off; /* Byte count at last time out. */ uint16_t output_iface; /* Output interface index. */ - uint8_t ip_tos; /* Last-seen IP type-of-service. */ uint8_t tcp_flags; /* Bitwise-OR of all TCP flags seen. */ }; @@ -66,8 +65,7 @@ void netflow_run(struct netflow *); void netflow_flow_clear(struct netflow_flow *); void netflow_flow_update_time(struct netflow *, struct netflow_flow *, long long int used); -void netflow_flow_update_flags(struct netflow_flow *, uint8_t ip_tos, - uint8_t tcp_flags); +void netflow_flow_update_flags(struct netflow_flow *, uint8_t tcp_flags); bool netflow_active_timeout_expired(struct netflow *, struct netflow_flow *); #endif /* netflow.h */ |