datapath-protocol: Rename to <linux/openvswitch.h>.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Bug #7559.

diff --git a/datapath/actions.c b/datapath/actions.c
index 470e617..a28e986 100644 (file)
--- a/datapath/actions.c
+++ b/datapath/actions.c
@@ -13,6 +13,7 @@
 #include <linux/skbuff.h>
 #include <linux/in.h>
 #include <linux/ip.h>
+#include <linux/openvswitch.h>
 #include <linux/tcp.h>
 #include <linux/udp.h>
 #include <linux/in6.h>
@@ -25,7 +26,6 @@
 #include "actions.h"
 #include "checksum.h"
 #include "datapath.h"
-#include "openvswitch/datapath-protocol.h"
 #include "vlan.h"
 #include "vport.h"
 

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 950bed1..b3e2442 100644 (file)
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -39,12 +39,12 @@
 #include <linux/netfilter_ipv4.h>
 #include <linux/inetdevice.h>
 #include <linux/list.h>
+#include <linux/openvswitch.h>
 #include <linux/rculist.h>
 #include <linux/dmi.h>
 #include <net/inet_ecn.h>
 #include <net/genetlink.h>
 
-#include "openvswitch/datapath-protocol.h"
 #include "checksum.h"
 #include "datapath.h"
 #include "actions.h"

diff --git a/datapath/flow.h b/datapath/flow.h
index 3590a7d..ade8ac8 100644 (file)
--- a/datapath/flow.h
+++ b/datapath/flow.h
@@ -11,6 +11,7 @@
 
 #include <linux/kernel.h>
 #include <linux/netlink.h>
+#include <linux/openvswitch.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>
 #include <linux/rcupdate.h>
@@ -19,7 +20,6 @@
 #include <linux/jiffies.h>
 #include <linux/time.h>
 #include <linux/flex_array.h>
-#include "openvswitch/datapath-protocol.h"
 
 struct sk_buff;
 

diff --git a/datapath/linux/compat/genetlink.inc b/datapath/linux/compat/genetlink.inc
index 9e7d90d..bf96980 100644 (file)
--- a/datapath/linux/compat/genetlink.inc
+++ b/datapath/linux/compat/genetlink.inc
@@ -5,9 +5,9 @@
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
 #include <linux/mutex.h>
+#include <linux/openvswitch.h>
 
 #include "openvswitch/datapath-compat.h"
-#include "openvswitch/datapath-protocol.h"
 
 static DEFINE_MUTEX(mc_group_mutex);
 

diff --git a/datapath/vport.h b/datapath/vport.h
index b6b94e0..2c9c4aa 100644 (file)
--- a/datapath/vport.h
+++ b/datapath/vport.h
@@ -10,12 +10,12 @@
 #define VPORT_H 1
 
 #include <linux/list.h>
+#include <linux/openvswitch.h>
 #include <linux/seqlock.h>
 #include <linux/skbuff.h>
 #include <linux/spinlock.h>
 
 #include "datapath.h"
-#include "openvswitch/datapath-protocol.h"
 
 struct vport;
 struct vport_parms;

diff --git a/include/linux/automake.mk b/include/linux/automake.mk
index aa7e739..6fba507 100644 (file)
--- a/include/linux/automake.mk
+++ b/include/linux/automake.mk
@@ -1 +1,3 @@
-noinst_HEADERS += include/linux/types.h
+noinst_HEADERS += \
+       include/linux/openvswitch.h \
+       include/linux/types.h

diff --git a/include/openvswitch/datapath-protocol.h b/include/linux/openvswitch.h
similarity index 99%
rename from include/openvswitch/datapath-protocol.h
rename to include/linux/openvswitch.h
index 07435be..c077f62 100644 (file)
--- a/include/openvswitch/datapath-protocol.h
+++ b/include/linux/openvswitch.h
@@ -37,8 +37,8 @@
  * ----------------------------------------------------------------------
  */
 
-#ifndef OPENVSWITCH_DATAPATH_PROTOCOL_H
-#define OPENVSWITCH_DATAPATH_PROTOCOL_H 1
+#ifndef _LINUX_OPENVSWITCH_H
+#define _LINUX_OPENVSWITCH_H 1
 
 #include <linux/types.h>
 
@@ -446,4 +446,4 @@ enum ovs_action_attr {
 
 #define OVS_ACTION_ATTR_MAX (__OVS_ACTION_ATTR_MAX - 1)
 
-#endif  /* openvswitch/datapath-protocol.h */
+#endif /* _LINUX_OPENVSWITCH_H */

diff --git a/include/linux/types.h b/include/linux/types.h
index 845924e..4579add 100644 (file)
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -20,7 +20,7 @@
 /* On Linux, this header file just includes <linux/types.h>.
  *
  * On other platforms, this header file implements just enough of
- * <linux/types.h> to allow datapath-protocol.h to work, that is, it defines
+ * <linux/types.h> to allow <linux/openvswitch.h> to work, that is, it defines
  * the __u<N> and __be<N> types. */
 
 #if __KERNEL__ || HAVE_LINUX_TYPES_H

diff --git a/include/openvswitch/automake.mk b/include/openvswitch/automake.mk
index 24a6826..757c765 100644 (file)
--- a/include/openvswitch/automake.mk
+++ b/include/openvswitch/automake.mk
@@ -1,7 +1,6 @@
 noinst_HEADERS += \
        include/openvswitch/brcompat-netlink.h \
        include/openvswitch/datapath-compat.h \
-       include/openvswitch/datapath-protocol.h \
        include/openvswitch/tunnel.h \
        include/openvswitch/types.h
 

diff --git a/include/openvswitch/tunnel.h b/include/openvswitch/tunnel.h
index cf27743..110e652 100644 (file)
--- a/include/openvswitch/tunnel.h
+++ b/include/openvswitch/tunnel.h
@@ -41,7 +41,7 @@
 #define OPENVSWITCH_TUNNEL_H 1
 
 #include <linux/types.h>
-#include "openvswitch/datapath-protocol.h"
+#include <linux/openvswitch.h>
 
 /* OVS_VPORT_ATTR_OPTIONS attributes for tunnels.
  *

diff --git a/lib/dpif-linux.h b/lib/dpif-linux.h
index ced869f..b08d28e 100644 (file)
--- a/lib/dpif-linux.h
+++ b/lib/dpif-linux.h
@@ -20,7 +20,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
-#include "openvswitch/datapath-protocol.h"
+#include <linux/openvswitch.h>
 
 struct ofpbuf;
 

diff --git a/lib/dpif.h b/lib/dpif.h
index f7ffbce..30f9b6d 100644 (file)
--- a/lib/dpif.h
+++ b/lib/dpif.h
@@ -21,8 +21,8 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
+#include <linux/openvswitch.h>
 #include "openflow/openflow.h"
-#include "openvswitch/datapath-protocol.h"
 #include "netdev.h"
 #include "util.h"
 

diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index 70cdf29..301bb43 100644 (file)
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
@@ -21,6 +21,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/socket.h>
+#include <linux/openvswitch.h>
 #include <linux/rtnetlink.h>
 #include <net/if.h>
 #include <sys/ioctl.h>
@@ -38,7 +39,6 @@
 #include "netlink-notifier.h"
 #include "netlink-socket.h"
 #include "ofpbuf.h"
-#include "openvswitch/datapath-protocol.h"
 #include "openvswitch/tunnel.h"
 #include "packets.h"
 #include "route-table.h"

diff --git a/lib/odp-util.h b/lib/odp-util.h
index 04a909c..04b8885 100644 (file)
--- a/lib/odp-util.h
+++ b/lib/odp-util.h
@@ -21,9 +21,9 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
+#include <linux/openvswitch.h>
 #include "hash.h"
 #include "openflow/openflow.h"
-#include "openvswitch/datapath-protocol.h"
 #include "util.h"
 
 struct ds;