OVS_EXCLUDED(ofproto->groups_rwlock);
static enum ofperr add_group(struct ofproto *, struct ofputil_group_mod *);
static void handle_openflow(struct ofconn *, const struct ofpbuf *);
-static enum ofperr do_bundle_flow_mod_begin(struct ofproto *,
+static enum ofperr do_bundle_flow_mod_start(struct ofproto *,
struct ofputil_flow_mod *,
struct ofp_bundle_entry *)
OVS_REQUIRES(ofproto_mutex);
*
* The caller retains ownership of 'fm->ofpacts'. */
static enum ofperr
-add_flow_begin(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
+add_flow_start(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
struct rule **rulep, bool *modify)
OVS_REQUIRES(ofproto_mutex)
{
return 0;
}
-/* Revert the effects of add_flow_begin().
+/* Revert the effects of add_flow_start().
* 'new_rule' must be passed in as NULL, if no new rule was allocated and
* inserted to the classifier.
* Note: evictions cannot be reverted. */
}
static enum ofperr
-modify_flows_begin__(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
+modify_flows_start__(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
struct rule_collection *rules)
OVS_REQUIRES(ofproto_mutex)
{
|| fm->new_cookie == OVS_BE64_MAX)) {
bool modify;
- error = add_flow_begin(ofproto, fm, &rules->rules[0], &modify);
+ error = add_flow_start(ofproto, fm, &rules->rules[0], &modify);
if (!error) {
ovs_assert(!modify);
}
* 'ofconn' is used to retrieve the packet buffer specified in fm->buffer_id,
* if any. */
static enum ofperr
-modify_flows_begin_loose(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
+modify_flows_start_loose(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
struct rule_collection *rules)
OVS_REQUIRES(ofproto_mutex)
{
rule_criteria_destroy(&criteria);
if (!error) {
- error = modify_flows_begin__(ofproto, fm, rules);
+ error = modify_flows_start__(ofproto, fm, rules);
}
if (error) {
/* Implements OFPFC_MODIFY_STRICT. Returns 0 on success or an OpenFlow error
* code on failure. */
static enum ofperr
-modify_flow_begin_strict(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
+modify_flow_start_strict(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
struct rule_collection *rules)
OVS_REQUIRES(ofproto_mutex)
{
if (!error) {
/* collect_rules_strict() can return max 1 rule. */
- error = modify_flows_begin__(ofproto, fm, rules);
+ error = modify_flows_start__(ofproto, fm, rules);
}
if (error) {
/* Implements OFPFC_DELETE. */
static enum ofperr
-delete_flows_begin_loose(struct ofproto *ofproto,
+delete_flows_start_loose(struct ofproto *ofproto,
const struct ofputil_flow_mod *fm,
struct rule_collection *rules)
OVS_REQUIRES(ofproto_mutex)
/* Implements OFPFC_DELETE_STRICT. */
static enum ofperr
-delete_flow_begin_strict(struct ofproto *ofproto,
+delete_flow_start_strict(struct ofproto *ofproto,
const struct ofputil_flow_mod *fm,
struct rule_collection *rules)
OVS_REQUIRES(ofproto_mutex)
enum ofperr error;
ovs_mutex_lock(&ofproto_mutex);
- error = do_bundle_flow_mod_begin(ofproto, fm, &be);
+ error = do_bundle_flow_mod_start(ofproto, fm, &be);
if (!error) {
do_bundle_flow_mod_finish(ofproto, fm, req, &be);
}
}
static enum ofperr
-do_bundle_flow_mod_begin(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
+do_bundle_flow_mod_start(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
struct ofp_bundle_entry *be)
OVS_REQUIRES(ofproto_mutex)
{
switch (fm->command) {
case OFPFC_ADD:
- return add_flow_begin(ofproto, fm, &be->rule, &be->modify);
+ return add_flow_start(ofproto, fm, &be->rule, &be->modify);
case OFPFC_MODIFY:
- return modify_flows_begin_loose(ofproto, fm, &be->rules);
+ return modify_flows_start_loose(ofproto, fm, &be->rules);
case OFPFC_MODIFY_STRICT:
- return modify_flow_begin_strict(ofproto, fm, &be->rules);
+ return modify_flow_start_strict(ofproto, fm, &be->rules);
case OFPFC_DELETE:
- return delete_flows_begin_loose(ofproto, fm, &be->rules);
+ return delete_flows_start_loose(ofproto, fm, &be->rules);
case OFPFC_DELETE_STRICT:
- return delete_flow_begin_strict(ofproto, fm, &be->rules);
+ return delete_flow_start_strict(ofproto, fm, &be->rules);
}
return OFPERR_OFPFMFC_BAD_COMMAND;
/* Not supported yet. */
error = OFPERR_OFPBFC_MSG_FAILED;
} else if (be->type == OFPTYPE_FLOW_MOD) {
- error = do_bundle_flow_mod_begin(ofproto, &be->fm, be);
+ error = do_bundle_flow_mod_start(ofproto, &be->fm, be);
} else {
OVS_NOT_REACHED();
}