The public header include/openvswitch/packets.h is renamed to net-proto.h to better reflect its contents after the network protocol code was moved into the net-proto module.
Co-authored-by: Aaron Conole <[email protected]> Signed-off-by: Aaron Conole <[email protected]> Signed-off-by: Timothy Redaelli <[email protected]> --- include/openvswitch/automake.mk | 2 +- include/openvswitch/flow.h | 2 +- include/openvswitch/match.h | 2 +- include/openvswitch/meta-flow.h | 2 +- include/openvswitch/{packets.h => net-proto.h} | 7 ++++--- lib/ofp-ct.c | 2 +- lib/ofp-match.c | 2 +- lib/packets.h | 2 +- 8 files changed, 11 insertions(+), 10 deletions(-) rename include/openvswitch/{packets.h => net-proto.h} (95%) diff --git a/include/openvswitch/automake.mk b/include/openvswitch/automake.mk index 0cc1f569e..e1e96a6fe 100644 --- a/include/openvswitch/automake.mk +++ b/include/openvswitch/automake.mk @@ -35,7 +35,7 @@ openvswitchinclude_HEADERS = \ include/openvswitch/ofp-switch.h \ include/openvswitch/ofp-table.h \ include/openvswitch/ofp-util.h \ - include/openvswitch/packets.h \ + include/openvswitch/net-proto.h \ include/openvswitch/poll-loop.h \ include/openvswitch/rconn.h \ include/openvswitch/shash.h \ diff --git a/include/openvswitch/flow.h b/include/openvswitch/flow.h index 86edbb85f..0dadb0a3e 100644 --- a/include/openvswitch/flow.h +++ b/include/openvswitch/flow.h @@ -17,7 +17,7 @@ #define OPENVSWITCH_FLOW_H 1 #include "openflow/nicira-ext.h" -#include "openvswitch/packets.h" +#include "openvswitch/net-proto.h" #include "openvswitch/util.h" #ifdef __cplusplus diff --git a/include/openvswitch/match.h b/include/openvswitch/match.h index 2e8812048..48ef2ec5e 100644 --- a/include/openvswitch/match.h +++ b/include/openvswitch/match.h @@ -18,7 +18,7 @@ #define OPENVSWITCH_MATCH_H 1 #include "openvswitch/flow.h" -#include "openvswitch/packets.h" +#include "openvswitch/net-proto.h" #include "openvswitch/tun-metadata.h" #ifdef __cplusplus diff --git a/include/openvswitch/meta-flow.h b/include/openvswitch/meta-flow.h index eb95946df..1dfcc3c61 100644 --- a/include/openvswitch/meta-flow.h +++ b/include/openvswitch/meta-flow.h @@ -26,7 +26,7 @@ #include "openvswitch/flow.h" #include "openvswitch/ofp-errors.h" #include "openvswitch/ofp-protocol.h" -#include "openvswitch/packets.h" +#include "openvswitch/net-proto.h" #include "openvswitch/util.h" #ifdef __cplusplus diff --git a/include/openvswitch/packets.h b/include/openvswitch/net-proto.h similarity index 95% rename from include/openvswitch/packets.h rename to include/openvswitch/net-proto.h index a65cb0d04..b8baadc65 100644 --- a/include/openvswitch/packets.h +++ b/include/openvswitch/net-proto.h @@ -14,10 +14,11 @@ * limitations under the License. */ -#ifndef OPENVSWITCH_PACKETS_H -#define OPENVSWITCH_PACKETS_H 1 +#ifndef OPENVSWITCH_NET_PROTO_H +#define OPENVSWITCH_NET_PROTO_H 1 #include <sys/types.h> +#include <sys/socket.h> #include <netinet/in.h> #include "openvswitch/tun-metadata.h" @@ -99,4 +100,4 @@ struct ovs_key_nsh { } #endif -#endif /* packets.h */ +#endif /* net-proto.h */ diff --git a/lib/ofp-ct.c b/lib/ofp-ct.c index 2e12790b4..20ce1aa20 100644 --- a/lib/ofp-ct.c +++ b/lib/ofp-ct.c @@ -30,7 +30,7 @@ #include "openvswitch/ofp-errors.h" #include "openvswitch/ofp-prop.h" #include "openvswitch/ofp-util.h" -#include "openvswitch/packets.h" +#include "openvswitch/net-proto.h" #include "openvswitch/vlog.h" VLOG_DEFINE_THIS_MODULE(ofp_ct); diff --git a/lib/ofp-match.c b/lib/ofp-match.c index 6525922ef..737cc2c3e 100644 --- a/lib/ofp-match.c +++ b/lib/ofp-match.c @@ -23,7 +23,7 @@ #include "openvswitch/ofp-errors.h" #include "openvswitch/ofp-msgs.h" #include "openvswitch/ofp-port.h" -#include "openvswitch/packets.h" +#include "openvswitch/net-proto.h" #include "openvswitch/vlog.h" VLOG_DEFINE_THIS_MODULE(ofp_match); diff --git a/lib/packets.h b/lib/packets.h index 35e40b2dd..647161b4b 100644 --- a/lib/packets.h +++ b/lib/packets.h @@ -23,7 +23,7 @@ #include <string.h> #include "compiler.h" #include "openvswitch/geneve.h" -#include "openvswitch/packets.h" +#include "openvswitch/net-proto.h" #include "openvswitch/types.h" #include "net-proto.h" #include "openvswitch/nsh.h" -- 2.54.0 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
