From 077257b83c68a36ea86f2d21c8395f60df710c21 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 5 Oct 2011 10:50:58 -0700 Subject: [PATCH] datapath-protocol: Rename to . Signed-off-by: Ben Pfaff Acked-by: Jesse Gross Bug #7559. --- datapath/actions.c | 2 +- datapath/datapath.c | 2 +- datapath/flow.h | 2 +- datapath/linux/compat/genetlink.inc | 2 +- datapath/vport.h | 2 +- include/linux/automake.mk | 4 +++- .../datapath-protocol.h => linux/openvswitch.h} | 6 +++--- include/linux/types.h | 2 +- include/openvswitch/automake.mk | 1 - include/openvswitch/tunnel.h | 2 +- lib/dpif-linux.h | 2 +- lib/dpif.h | 2 +- lib/netdev-vport.c | 2 +- lib/odp-util.h | 2 +- 14 files changed, 17 insertions(+), 16 deletions(-) rename include/{openvswitch/datapath-protocol.h => linux/openvswitch.h} (99%) diff --git a/datapath/actions.c b/datapath/actions.c index 470e617b9..a28e98662 100644 --- a/datapath/actions.c +++ b/datapath/actions.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -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 950bed1b7..b3e24427c 100644 --- a/datapath/datapath.c +++ b/datapath/datapath.c @@ -39,12 +39,12 @@ #include #include #include +#include #include #include #include #include -#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 3590a7dff..ade8ac808 100644 --- a/datapath/flow.h +++ b/datapath/flow.h @@ -11,6 +11,7 @@ #include #include +#include #include #include #include @@ -19,7 +20,6 @@ #include #include #include -#include "openvswitch/datapath-protocol.h" struct sk_buff; diff --git a/datapath/linux/compat/genetlink.inc b/datapath/linux/compat/genetlink.inc index 9e7d90da7..bf9698027 100644 --- 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 +#include #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 b6b94e010..2c9c4aa1d 100644 --- a/datapath/vport.h +++ b/datapath/vport.h @@ -10,12 +10,12 @@ #define VPORT_H 1 #include +#include #include #include #include #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 aa7e7392a..6fba5075a 100644 --- 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 07435beba..c077f6206 100644 --- 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 @@ -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 845924ec0..4579add21 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -20,7 +20,7 @@ /* On Linux, this header file just includes . * * On other platforms, this header file implements just enough of - * to allow datapath-protocol.h to work, that is, it defines + * to allow to work, that is, it defines * the __u and __be types. */ #if __KERNEL__ || HAVE_LINUX_TYPES_H diff --git a/include/openvswitch/automake.mk b/include/openvswitch/automake.mk index 24a682647..757c765b0 100644 --- 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 cf277434e..110e65277 100644 --- a/include/openvswitch/tunnel.h +++ b/include/openvswitch/tunnel.h @@ -41,7 +41,7 @@ #define OPENVSWITCH_TUNNEL_H 1 #include -#include "openvswitch/datapath-protocol.h" +#include /* OVS_VPORT_ATTR_OPTIONS attributes for tunnels. * diff --git a/lib/dpif-linux.h b/lib/dpif-linux.h index ced869fb2..b08d28e5c 100644 --- a/lib/dpif-linux.h +++ b/lib/dpif-linux.h @@ -20,7 +20,7 @@ #include #include #include -#include "openvswitch/datapath-protocol.h" +#include struct ofpbuf; diff --git a/lib/dpif.h b/lib/dpif.h index f7ffbcec5..30f9b6ddc 100644 --- a/lib/dpif.h +++ b/lib/dpif.h @@ -21,8 +21,8 @@ #include #include #include +#include #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 70cdf2907..301bb43da 100644 --- a/lib/netdev-vport.c +++ b/lib/netdev-vport.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -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 04a909ca0..04b8885bc 100644 --- a/lib/odp-util.h +++ b/lib/odp-util.h @@ -21,9 +21,9 @@ #include #include #include +#include #include "hash.h" #include "openflow/openflow.h" -#include "openvswitch/datapath-protocol.h" #include "util.h" struct ds; -- 2.45.2