Merge remote branch 'repo/master' into stats

[sliver-openvswitch.git] / include / openflow-netlink.h

diff --git a/include/openflow-netlink.h b/include/openflow-netlink.h
index d9862b0..e749477 100644 (file)
--- a/include/openflow-netlink.h
+++ b/include/openflow-netlink.h
@@ -42,21 +42,11 @@
 /* Attributes that can be attached to the datapath's netlink messages. */
 enum {
        DP_GENL_A_UNSPEC,
-    DP_GENL_A_OFPHEADER, /* OFP header information */
        DP_GENL_A_DP_IDX,        /* Datapath Ethernet 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_INFO,   /* OpenFlow datapath information */
-
-    DP_GENL_A_FLOW,      /* OpenFlow flow entry */
-    DP_GENL_A_NUMFLOWS,  /* Number of flows  */
-    DP_GENL_A_TABLEIDX,  /* Flow table index */
-
-    DP_GENL_A_TABLE,     /* OpenFlow table entry */
-    DP_GENL_A_NUMTABLES, /* Number of tables in a table query */
-
     DP_GENL_A_NPACKETS,  /* Number of packets to send up netlink */
     DP_GENL_A_PSIZE,     /* Size of packets to send up netlink */
 
@@ -70,27 +60,14 @@ enum dp_genl_command {
        DP_GENL_C_ADD_DP,        /* Create datapath. */
        DP_GENL_C_DEL_DP,        /* Destroy datapath. */
        DP_GENL_C_QUERY_DP,      /* Get multicast group for datapath. */
-       DP_GENL_C_SHOW_DP,       /* Show information about datapath. */
        DP_GENL_C_ADD_PORT,      /* Add port to datapath. */
        DP_GENL_C_DEL_PORT,      /* Remove port from datapath. */
        DP_GENL_C_OPENFLOW,  /* Encapsulated OpenFlow protocol. */
 
-    DP_GENL_C_QUERY_FLOW,  /* Request flow entries. */
-    DP_GENL_C_QUERY_TABLE, /* Request table entries. */
-
     DP_GENL_C_BENCHMARK_NL, /* Benchmark netlink connection */
 
        __DP_GENL_C_MAX,
        DP_GENL_C_MAX = __DP_GENL_C_MAX - 1
 };
 
-/* Table */
-enum {
-    TBL_MACONLY,
-    TBL_HASH,
-    TBL_LINEAR,
-     __TBL_MAX,
-     TBL_MAX = __TBL_MAX - 1
-};
-
 #endif /* openflow_netlink_h */