Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…

…t/pshelar/openvswitch Pravin B Shelar says: ==================== Open vSwitch A set of OVS changes for net-next/3.16. Most of change are related to improving performance of flow setup by minimizing critical sections. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
mariux64 · May 23, 2014 · 915f15c · 915f15c
2 parents 091b648 + 0c200ef
commit 915f15c
Show file tree

Hide file tree

Showing 6 changed files with 558 additions and 463 deletions.
diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h
@@ -395,7 +395,9 @@ struct ovs_key_nd {
  * @OVS_FLOW_ATTR_ACTIONS: Nested %OVS_ACTION_ATTR_* attributes specifying
  * the actions to take for packets that match the key.  Always present in
  * notifications.  Required for %OVS_FLOW_CMD_NEW requests, optional for
- * %OVS_FLOW_CMD_SET requests.
+ * %OVS_FLOW_CMD_SET requests.  An %OVS_FLOW_CMD_SET without
+ * %OVS_FLOW_ATTR_ACTIONS will not modify the actions.  To clear the actions,
+ * an %OVS_FLOW_ATTR_ACTIONS without any nested attributes must be given.
  * @OVS_FLOW_ATTR_STATS: &struct ovs_flow_stats giving statistics for this
  * flow.  Present in notifications if the stats would be nonzero.  Ignored in
  * requests.