[ovs-git] Open vSwitch: sflow: Always add a poller and a sampler at the same time. (sflow)

[dev at openvswitch.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Open vSwitch".

The branch, sflow has been updated
       via  c2135d0600aca28d870452b3c4b43b7318b32599 (commit)
       via  6d72380c7dbd776831154327f7217779cecc15bf (commit)
       via  8aa50e6cd845f4531a7cbd963aa1c834e07a01ba (commit)
      from  56fd8edf80b6098289f9ddd94a6a4be3be648472 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c2135d0600aca28d870452b3c4b43b7318b32599
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=c2135d0600aca28d870452b3c4b43b7318b32599
Author: Neil McKee <neil.mckee at inmon.com>
		
sflow: Always add a poller and a sampler at the same time.
		
The ofproto_sflow_add_poller() and ofproto_sflow_add_sampler() calls
should always be made together, either when a port is added
dynamically with ofproto_sflow_add_port() or when the sflow_agent is
first created in ofproto_sflow_set_options().  (It's OK to add the
same sampler or poller again, because the library routines
sfl_agent_addPoller() and sfl_agent_addSampler() will just return the
existing one if it is there.  Perhaps we should add a comment to make
that clear?)

Also, change the parameters to ofproto_sflow_add_sampler to make it
work the same way as ofproto_sflow_add_poller, where the options are
extracted from os->options within the function itself.


commit 6d72380c7dbd776831154327f7217779cecc15bf
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=6d72380c7dbd776831154327f7217779cecc15bf
Author: Neil McKee <neil.mckee at inmon.com>
		
sflow: Output VLAN should initially be same as input VLAN.
		


commit 8aa50e6cd845f4531a7cbd963aa1c834e07a01ba
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=8aa50e6cd845f4531a7cbd963aa1c834e07a01ba
Author: Neil McKee <neil.mckee at inmon.com>
		
sflow: Properly include FCS in frame_length calculation.
		
The frame_length field needed to have 4 added to it, to count the FCS bytes
that were already stripped off before we got hold of the packet.  (This is
then indicated immediately below where we set stripped to 4).


-----------------------------------------------------------------------

Summary of changes:
 ofproto/ofproto-sflow.c |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
Open vSwitch