X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fopenflow-netlink.h;h=eb0f85818af4bec8c01f2d70fa40f28d73a3ca97;hb=6ef891ae6b23247b4e9dc86f560e92f245b076b8;hp=31bd71ebcf15d36e443d3fb019d940d5e4b10fd8;hpb=468e00132f76a6d057da1520873e7a468ccae422;p=sliver-openvswitch.git

diff --git a/include/openflow-netlink.h b/include/openflow-netlink.h
index 31bd71ebc..eb0f85818 100644
--- a/include/openflow-netlink.h
+++ b/include/openflow-netlink.h
@@ -1,52 +1,49 @@
-/* Copyright (C) 2007 Board of Trustees, Leland Stanford Jr. University.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
+/* Copyright (c) 2008 The Board of Trustees of The Leland Stanford
+ * Junior University
+ * 
+ * We are making the OpenFlow specification and associated documentation
+ * (Software) available for public use and benefit with the expectation
+ * that others will use, modify and enhance the Software and contribute
+ * those enhancements back to the community. However, since we would
+ * like to make the Software available for broadest use, with as few
+ * restrictions as possible permission is hereby granted, free of
+ * charge, to any person obtaining a copy of this Software to deal in
+ * the Software under the copyrights without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * The name and trademarks of copyright holder(s) may NOT be used in
+ * advertising or publicity pertaining to the Software or any
+ * derivatives without specific, written prior permission.
  */
 
 #ifndef OPENFLOW_NETLINK_H
 #define OPENFLOW_NETLINK_H 1
 
-#include <linux/netlink.h>
-
 #define DP_GENL_FAMILY_NAME "OpenFlow"
 
 /* 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 */
-
 	__DP_GENL_A_MAX,
 	DP_GENL_A_MAX = __DP_GENL_A_MAX - 1
 };
@@ -57,27 +54,12 @@ 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 */
+#endif /* openflow-netlink.h */