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 d915ea736cb21fc5b199c69c666ad91985342d85..931e6972d7957c86ba65d7dd9ddd38e0b41390c0 100644 (file)
--- 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