[ovs-git] [openvswitch/ovs] 097673: Revert "miniflow: Remove unused values_inline bran...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/openvswitch/ovs
  Commit: 097673a636ad7684d89ed3a9a858f6afae586822
      https://github.com/openvswitch/ovs/commit/097673a636ad7684d89ed3a9a858f6afae586822
  Author: Jarno Rajahalme <jrajahalme at nicira.com>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M lib/flow.c

  Log Message:
  -----------
  Revert "miniflow: Remove unused values_inline branch from miniflow_move()"

This reverts commit 29d2aa3aa74ab97df0f00af5bddaa12485c1d39a.

Turns out the code was correct but the dynamic nature of miniflow
inline storage was poorly documented.  A following patch fixes the
documentation.

Signed-off-by: Jarno Rajahalme <jrajahalme at nicira.com>


  Commit: 3c30d1118e2e28cad795f342c984acb5e89431d7
      https://github.com/openvswitch/ovs/commit/3c30d1118e2e28cad795f342c984acb5e89431d7
  Author: Jarno Rajahalme <jrajahalme at nicira.com>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M lib/flow.c
    M lib/flow.h

  Log Message:
  -----------
  lib/flow.h: Improve struct miniflow comment and definition.

Miniflows can nowadays be dynamically allocated to different inline
sizes, as done by lib/classifier.c, but this had not been documented
at the struct miniflow definition.

Also, MINI_N_INLINE had a different value for 32-bit and 64-bit builds
due to a historical reason.  Now we use 8 for both.

Finally, use change the storage type of 'values_inline' to uint8_t, as
uint64_t looks kind of wide for a boolean, even though we intend the
bit be carved out from the uint64_t where 'map' resides.

Suggested-by: Ben Pfaff <blp at nicira.com>
Signed-off-by: Jarno Rajahalme <jrajahalme at nicira.com>


Compare: https://github.com/openvswitch/ovs/compare/caac88029f94...3c30d1118e2e