From: Simon Horman <horms@verge.net.au>
Date: Tue, 28 Feb 2012 00:08:43 +0000 (+0900)
Subject: Use struct nicira_header nxh in struct nx_set_flow_format
X-Git-Tag: sliver-openvswitch-0.1-1~300
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=59e32148fe6bc36eb64f77f342a0ae5ce7d12bef;p=sliver-openvswitch.git

Use struct nicira_header nxh in struct nx_set_flow_format

This makes struct nx_set_flow_format consistent with
other similar structures.

Acked-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/include/openflow/nicira-ext.h b/include/openflow/nicira-ext.h
index b66b806ed..44b3ddd90 100644
--- a/include/openflow/nicira-ext.h
+++ b/include/openflow/nicira-ext.h
@@ -1758,9 +1758,7 @@ enum nx_flow_format {
 
 /* NXT_SET_FLOW_FORMAT request. */
 struct nx_set_flow_format {
-    struct ofp_header header;
-    ovs_be32 vendor;            /* NX_VENDOR_ID. */
-    ovs_be32 subtype;           /* NXT_SET_FLOW_FORMAT. */
+    struct nicira_header nxh;
     ovs_be32 format;            /* One of NXFF_*. */
 };
 OFP_ASSERT(sizeof(struct nx_set_flow_format) == 20);