This reverts commit
cae7a4b90a55cbfd4cfd23c06f9f09cd429ab4c0.
This commit forced the user to specify an action when deleting a flow,
which is not desirable. The change was not actually needed, as the
buffer is never passed to str_to_flow() in the original code.
uint16_t out_port;
struct ofpbuf *buffer;
struct ofp_flow_mod *ofm;
uint16_t out_port;
struct ofpbuf *buffer;
struct ofp_flow_mod *ofm;
- struct ofp_match match;
- /* Parse and send. str_to_flow() will expand and reallocate the data in
- * 'buffer', so we can't keep pointers to across the str_to_flow() call. */
- make_openflow(sizeof *ofm, OFPT_FLOW_MOD, &buffer);
- str_to_flow(argc > 2 ? argv[2] : "", &match, buffer,
- NULL, &out_port, &priority, NULL, NULL);
- ofm = buffer->data;
- ofm->match = match;
+ /* Parse and send. */
+ ofm = make_openflow(sizeof *ofm, OFPT_FLOW_MOD, &buffer);
+ str_to_flow(argc > 2 ? argv[2] : "", &ofm->match, NULL, NULL,
+ &out_port, &priority, NULL, NULL);
if (s->strict) {
ofm->command = htons(OFPFC_DELETE_STRICT);
} else {
if (s->strict) {
ofm->command = htons(OFPFC_DELETE_STRICT);
} else {