These commits clean up datapath-protocol.h to make it more upstreamable
and fix a number of other problems I noticed along the way.
The final commit to move rename "openvswitch/datapath-protocol.h"
to <linux/openvswitch.h> is a bonus that might be premature.
Only "datapath: Move Netlink PID for userspace actions from flows to
actions." has been previously posted. This version now includes an
update to dpif-netdev to propely implement the userspace action.
I formerly tested that the userspace action worked OK with the Linux
datapath. I haven't re-tested it for this series. I haven't tested
the new dpif-netdev implementation of the userspace or sample actions.
I tested that this passes the testsuite.
Ben Pfaff (11):
openflow: Delete icmp_type and icmp_code macros.
netlink: New macros NL_NESTED_FOR_EACH, NL_NESTED_FOR_EACH_UNSAFE.
dpif-netdev: Simplify code by removing
dpif_netdev_validate_actions().
dpif-netdev: Implement OVS_ACTION_ATTR_SAMPLE action.
dpif-linux: Use get_32aligned_u64() in an appropriate place.
datapath: Move Netlink PID for userspace actions from flows to
actions.
datapath-protocol: Remove #include <linux/netlink.h>.
datapath-protocol: Remove socket header #include.
datapath-protocol: Rename enums for consistency.
datapath-protocol: Use Linux kernel types directly.
datapath-protocol: Rename to <linux/openvswitch.h>.
configure.ac | 2 +-
datapath/actions.c | 26 +++-
datapath/datapath.c | 75 +++++-----
datapath/datapath.h | 4 +
datapath/flow.h | 3 +-
datapath/linux/compat/genetlink.inc | 2 +-
datapath/vport.h | 2 +-
include/automake.mk | 1 +
include/linux/automake.mk | 3 +
.../datapath-protocol.h => linux/openvswitch.h} | 159 +++++++++----------
include/linux/types.h | 47 ++++++
include/openflow/openflow.h | 5 -
include/openvswitch/automake.mk | 1 -
include/openvswitch/tunnel.h | 2 +-
include/openvswitch/types.h | 12 +-
lib/classifier.c | 4 +-
lib/dpif-linux.c | 120 ++++-----------
lib/dpif-linux.h | 3 +-
lib/dpif-netdev.c | 166 +++++++++-----------
lib/dpif-provider.h | 18 ++-
lib/dpif.c | 24 +++-
lib/dpif.h | 3 +-
lib/flow.c | 8 +-
lib/meta-flow.c | 14 +-
lib/netdev-vport.c | 2 +-
lib/netlink-socket.c | 6 +-
lib/netlink.h | 6 +
lib/odp-util.c | 88 +++++++---
lib/odp-util.h | 3 +-
lib/ofp-print.c | 4 +-
ofproto/ofproto-dpif.c | 63 +++++---
31 files changed, 482 insertions(+), 394 deletions(-)
create mode 100644 include/linux/automake.mk
rename include/{openvswitch/datapath-protocol.h => linux/openvswitch.h} (81%)
create mode 100644 include/linux/types.h
--
1.7.2.5
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
