From: Ben Pfaff <blp@nicira.com>
Date: Tue, 30 Dec 2008 19:31:25 +0000 (-0800)
Subject: Restore openflow-netlink.h ABI.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edda5bca61af5e22cdafc98612806f60c7b6f9df;p=openvswitch

Restore openflow-netlink.h ABI.

Inserting DP_GENL_A_DP_NAME above DP_GENL_A_PORTNAME in commit
660f6596ba31, "First cut at bridge compatibility for vswitchd" forces users
not to use any existing builds of userspace utilities, because the
numbering of all the netlink attributes for OpenFlow has changed.  This
change restores the numbering and should make older dpctl, etc. still able
to work.
---

diff --git a/include/openflow/openflow-netlink.h b/include/openflow/openflow-netlink.h
index d915ea73..931e6972 100644
--- a/include/openflow/openflow-netlink.h
+++ b/include/openflow/openflow-netlink.h
@@ -40,10 +40,10 @@
 enum {
 	DP_GENL_A_UNSPEC,
 	DP_GENL_A_DP_IDX,	 /* Datapath device index. */
-	DP_GENL_A_DP_NAME,	 /* Datapath device name. */
 	DP_GENL_A_PORTNAME,	 /* Device name for datapath port. */
 	DP_GENL_A_MC_GROUP,	 /* Generic netlink multicast group. */
 	DP_GENL_A_OPENFLOW,  /* OpenFlow packet. */
+	DP_GENL_A_DP_NAME,	 /* Datapath device name. */
 
 	__DP_GENL_A_MAX,
 	DP_GENL_A_MAX = __DP_GENL_A_MAX - 1