On Mon, Mar 2, 2015 at 2:30 PM, Jarno Rajahalme <[email protected]> wrote: > LGTM, except for one question below, > > Acked-by: Jarno Rajahalme <[email protected]> > Thanks for quick review.
>> On Mar 2, 2015, at 10:51 AM, Pravin B Shelar <[email protected]> wrote: >> >> dp_packet is shorter, so I prefer it over current name. >> >> Signed-off-by: Pravin B Shelar <[email protected]> >> — >> > > (snip) > >> diff --git a/lib/tnl-arp-cache.c b/lib/tnl-arp-cache.c >> index 89f38cf..8b7228e 100644 >> --- a/lib/tnl-arp-cache.c >> +++ b/lib/tnl-arp-cache.c >> @@ -21,6 +21,7 @@ >> #include "bitmap.h" >> #include "cmap.h" >> #include "coverage.h" >> +#include "dp-packet.h" >> #include "dpif-netdev.h" >> #include "dynamic-string.h" >> #include "errno.h" >> @@ -28,7 +29,6 @@ >> #include "netdev.h" >> #include "ovs-thread.h" >> #include "packets.h" >> -#include "packet-dpif.h" >> #include "poll-loop.h" >> #include "seq.h" >> #include “timeval.h" > > Are there any actual uses in this file, as no actual code changes were needed? > There is none, I will remove this header file include. > >> diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c >> index 5b9f1c8..2373820 100644 >> --- a/ofproto/ofproto-dpif-xlate.c >> +++ b/ofproto/ofproto-dpif-xlate.c >> @@ -31,6 +31,7 @@ >> #include "cfm.h" >> #include "connmgr.h" >> #include "coverage.h" >> +#include "dp-packet.h" >> #include "dpif.h" >> #include "dynamic-string.h" >> #include "in-band.h" >> @@ -52,7 +53,6 @@ >> #include "ofproto/ofproto-dpif-sflow.h" >> #include "ofproto/ofproto-dpif.h" >> #include "ofproto/ofproto-provider.h" >> -#include "packet-dpif.h" >> #include "ovs-router.h" >> #include "tnl-ports.h" >> #include "tunnel.h" >> @@ -3196,14 +3196,14 @@ execute_controller_action(struct xlate_ctx *ctx, int >> len, >> uint16_t controller_id) >> { >> struct ofproto_packet_in *pin; >> - struct dpif_packet *packet; >> + struct dp_packet *packet; >> >> ctx->xout->slow |= SLOW_CONTROLLER; >> if (!ctx->xin->packet) { >> return; >> } >> >> - packet = dpif_packet_clone_from_ofpbuf(ctx->xin->packet); >> + packet = dp_packet_clone_from_ofpbuf(ctx->xin->packet); >> >> ctx->xout->slow |= commit_odp_actions(&ctx->xin->flow, &ctx->base_flow, >> ctx->xout->odp_actions, >> @@ -3244,7 +3244,7 @@ execute_controller_action(struct xlate_ctx *ctx, int >> len, >> } >> } >> ofproto_dpif_send_packet_in(ctx->xbridge->ofproto, pin); >> - dpif_packet_delete(packet); >> + dp_packet_delete(packet); >> } >> >> static void >> -- >> 1.7.1 >> >> _______________________________________________ >> dev mailing list >> [email protected] >> http://openvswitch.org/mailman/listinfo/dev > _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
