ofproto: connmgr_send_packet_in() doesn't need buffer_id and total_len.

[openvswitch] / ofproto / ofproto-dpif.c

diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index ac14feefd447144c9738e23d499c81a9b779db83..642e3b0f8d71f27908282dc82450d65ffeceec58 100644 (file)
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -2471,14 +2471,12 @@ send_packet_in_miss(struct ofproto_dpif *ofproto, const struct ofpbuf *packet,
 
     pin.packet = packet->data;
     pin.packet_len = packet->size;
-    pin.total_len = packet->size;
     pin.reason = OFPR_NO_MATCH;
     pin.controller_id = 0;
 
     pin.table_id = 0;
     pin.cookie = 0;
 
-    pin.buffer_id = 0;          /* not yet known */
     pin.send_len = 0;           /* not used for flow table misses */
 
     flow_get_metadata(flow, &pin.fmd);
@@ -2486,7 +2484,7 @@ send_packet_in_miss(struct ofproto_dpif *ofproto, const struct ofpbuf *packet,
     /* Registers aren't meaningful on a miss. */
     memset(pin.fmd.reg_masks, 0, sizeof pin.fmd.reg_masks);
 
-    connmgr_send_packet_in(ofproto->up.connmgr, &pin, flow);
+    connmgr_send_packet_in(ofproto->up.connmgr, &pin);
 }
 
 static bool
@@ -4535,12 +4533,10 @@ execute_controller_action(struct action_xlate_ctx *ctx, int len,
     pin.table_id = ctx->table_id;
     pin.cookie = ctx->rule ? ctx->rule->up.flow_cookie : 0;
 
-    pin.buffer_id = 0;
     pin.send_len = len;
-    pin.total_len = packet->size;
     flow_get_metadata(&ctx->flow, &pin.fmd);
 
-    connmgr_send_packet_in(ctx->ofproto->up.connmgr, &pin, &ctx->flow);
+    connmgr_send_packet_in(ctx->ofproto->up.connmgr, &pin);
     ofpbuf_delete(packet);
 }