return execute_ab(bundle, slave_enabled, aux);
default:
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
}
}
if (slaves_size < bundle->n_slaves * sizeof(ovs_be16)) {
- VLOG_WARN_RL(&rl, "Nicira action %"PRIu16" only has %zu bytes "
- "allocated for slaves. %zu bytes are required for "
+ VLOG_WARN_RL(&rl, "Nicira action %"PRIu16" only has %"PRIuSIZE" bytes "
+ "allocated for slaves. %"PRIuSIZE" bytes are required for "
"%"PRIu16" slaves.", subtype, slaves_size,
bundle->n_slaves * sizeof(ovs_be16), bundle->n_slaves);
error = OFPERR_OFPBAC_BAD_LEN;
ofpbuf_put(ofpacts, &ofp_port, sizeof ofp_port);
}
- bundle = ofpacts->l2;
+ bundle = ofpacts->frame;
ofpact_update_len(ofpacts, &bundle->ofpact);
if (!error) {
}
ofpbuf_put(ofpacts, &slave_port, sizeof slave_port);
- bundle = ofpacts->l2;
+ bundle = ofpacts->frame;
bundle->n_slaves++;
}
ofpact_update_len(ofpacts, &bundle->ofpact);