Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 915f15ca authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/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: default avatarDavid S. Miller <davem@davemloft.net>
parents 091b6486 0c200ef9

include/uapi/linux/openvswitch.h

+3 −1
Original line number Diff line number Diff line
@@ -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.