[ovs-git] [openvswitch/ovs] bff606: dpif: Don't initialize output UFID in dpif_flow_ge...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: bff6067904172b6f5034437e97f89598dbf41529
      https://github.com/openvswitch/ovs/commit/bff6067904172b6f5034437e97f89598dbf41529
  Author: Joe Stringer <joestringer at nicira.com>
  Date:   2014-12-12 (Fri, 12 Dec 2014)

  Changed paths:
    M lib/dpif.c

  Log Message:
  -----------
  dpif: Don't initialize output UFID in dpif_flow_get().

The UFID parameter to dpif_flow_get() is optional, but the current
implementation dereferences it to initialize part of the output flow.
This field is filled in by the dpif implementation, so don't initialize
it here.

This does not fix any existing bug because every caller currently passes
in a UFID. The next patch will introduce the first call to
dpif_flow_get() that doesn't provide a UFID, which would break without
this change.

Signed-off-by: Joe Stringer <joestringer at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>


  Commit: 2c85851f8ec2ac1c0ce60ab30981990f250d77da
      https://github.com/openvswitch/ovs/commit/2c85851f8ec2ac1c0ce60ab30981990f250d77da
  Author: Joe Stringer <joestringer at nicira.com>
  Date:   2014-12-12 (Fri, 12 Dec 2014)

  Changed paths:
    M lib/dpif-netlink.c
    M lib/dpif.c
    M lib/dpif.h
    M ofproto/ofproto-dpif.c

  Log Message:
  -----------
  dpif: Refactor datapath feature detection.

Various functions in ofproto-dpif and dpif-netlink detect support for
features in very similar ways. Refactor their common code to a single
function.

Signed-off-by: Joe Stringer <joestringer at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>


  Commit: 9ab0fce1798750b7143540c49c3d03aa6c7549cc
      https://github.com/openvswitch/ovs/commit/9ab0fce1798750b7143540c49c3d03aa6c7549cc
  Author: Joe Stringer <joestringer at nicira.com>
  Date:   2014-12-12 (Fri, 12 Dec 2014)

  Changed paths:
    M lib/dpif.c

  Log Message:
  -----------
  dpif: Use DPIF_FP_MODIFY for feature probes.

If ovs-vswitchd is killed at the right time, then a probe flow may be
left in the datapath. This commit adds the DPIF_FP_MODIFY flag to
feature probes so that re-creating the same probe flow will not cause an
error.

These flow_put flags were previously changed in commit a7d1bbdcfe49e8
("ofproto-dpif: Use DPIF_FP_CREATE but not DPIF_FP_MODIFY."), despite
the commit message addressing a different case.

Suggested-by: Ben Pfaff <blp at nicira.com>
Signed-off-by: Joe Stringer <joestringer at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>


Compare: https://github.com/openvswitch/ovs/compare/36673528f8a0...9ab0fce17987