diff options
Diffstat (limited to 'ofproto')
| -rw-r--r-- | ofproto/ofproto-dpif.c | 3 | ||||
| -rw-r--r-- | ofproto/ofproto.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index a8a417d6c..78ea18425 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -1250,7 +1250,6 @@ add_internal_flows(struct ofproto_dpif *ofproto) * (priority=2), recirc=0, actions=resubmit(, 0) */ resubmit = ofpact_put_RESUBMIT(&ofpacts); - resubmit->ofpact.compat = 0; resubmit->in_port = OFPP_IN_PORT; resubmit->table_id = 0; @@ -4291,7 +4290,7 @@ ofproto_unixctl_trace_actions(struct unixctl_conn *conn, int argc, ofpbuf_init(&ofpacts, 0); /* Parse actions. */ - error = parse_ofpacts(argv[--argc], &ofpacts, &usable_protocols); + error = ofpacts_parse_actions(argv[--argc], &ofpacts, &usable_protocols); if (error) { unixctl_command_reply_error(conn, error); free(error); diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index cc88bdac6..ec7337766 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -3195,7 +3195,7 @@ handle_table_features_request(struct ofconn *ofconn, ofpraw_pull_assert(&msg); if (ofpbuf_size(&msg) || ofpmp_more(request)) { return OFPERR_OFPTFFC_EPERM; - } + } query_tables(ofproto, &features, NULL); |