From: Ben Pfaff Date: Thu, 31 May 2012 03:30:05 +0000 (-0700) Subject: ofp-util: Remove unused functions make_add_simple_flow(), make_del_flow(). X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16d659f1f389a25ec231360ba31172efc3a1182b;p=openvswitch ofp-util: Remove unused functions make_add_simple_flow(), make_del_flow(). Reviewed-by: Simon Horman Signed-off-by: Ben Pfaff --- diff --git a/lib/ofp-util.c b/lib/ofp-util.c index 5bd220b6..07f885d2 100644 --- a/lib/ofp-util.c +++ b/lib/ofp-util.c @@ -3413,32 +3413,6 @@ make_add_flow(const struct cls_rule *rule, uint32_t buffer_id, return out; } -struct ofpbuf * -make_del_flow(const struct cls_rule *rule) -{ - struct ofpbuf *out = make_flow_mod(OFPFC_DELETE_STRICT, rule, 0); - struct ofp_flow_mod *ofm = out->data; - ofm->out_port = htons(OFPP_NONE); - return out; -} - -struct ofpbuf * -make_add_simple_flow(const struct cls_rule *rule, - uint32_t buffer_id, uint16_t out_port, - uint16_t idle_timeout) -{ - if (out_port != OFPP_NONE) { - struct ofp_action_output *oao; - struct ofpbuf *buffer; - - buffer = make_add_flow(rule, buffer_id, idle_timeout, sizeof *oao); - ofputil_put_OFPAT10_OUTPUT(buffer)->port = htons(out_port); - return buffer; - } else { - return make_add_flow(rule, buffer_id, idle_timeout, 0); - } -} - struct ofpbuf * make_packet_in(uint32_t buffer_id, uint16_t in_port, uint8_t reason, const struct ofpbuf *payload, int max_send_len) diff --git a/lib/ofp-util.h b/lib/ofp-util.h index 9f4520ca..6b3128a5 100644 --- a/lib/ofp-util.h +++ b/lib/ofp-util.h @@ -546,10 +546,6 @@ struct ofpbuf *make_flow_mod(uint16_t command, const struct cls_rule *, size_t actions_len); struct ofpbuf *make_add_flow(const struct cls_rule *, uint32_t buffer_id, uint16_t max_idle, size_t actions_len); -struct ofpbuf *make_del_flow(const struct cls_rule *); -struct ofpbuf *make_add_simple_flow(const struct cls_rule *, - uint32_t buffer_id, uint16_t out_port, - uint16_t max_idle); struct ofpbuf *make_packet_in(uint32_t buffer_id, uint16_t in_port, uint8_t reason, const struct ofpbuf *payload, int max_send_len);