ofproto: Remove member whose value is always -1 from struct ofoperation.
authorBen Pfaff <blp@nicira.com>
Thu, 14 Jun 2012 16:30:28 +0000 (09:30 -0700)
committerBen Pfaff <blp@nicira.com>
Thu, 14 Jun 2012 16:30:28 +0000 (09:30 -0700)
Signed-off-by: Ben Pfaff <blp@nicira.com>
ofproto/ofproto.c

index a6106cd3b9ca4314d1907319e9e0f6fc70030253..f5388690dc9981fa19012e2f74eeaaf54903a944 100644 (file)
@@ -117,7 +117,6 @@ struct ofoperation {
     struct hmap_node hmap_node; /* In ofproto's "deletions" hmap. */
     struct rule *rule;          /* Rule being operated upon. */
     enum ofoperation_type type; /* Type of operation. */
-    int status;                 /* -1 if pending, otherwise 0 or error code. */
     struct rule *victim;        /* OFOPERATION_ADDING: Replaced rule. */
     union ofp_action *actions;  /* OFOPERATION_MODIFYING: Replaced actions. */
     int n_actions;              /* OFOPERATION_MODIFYING: # of old actions. */
@@ -3509,7 +3508,6 @@ ofoperation_create(struct ofopgroup *group, struct rule *rule,
     list_push_back(&group->ops, &op->group_node);
     op->rule = rule;
     op->type = type;
-    op->status = -1;
     op->flow_cookie = rule->flow_cookie;
 
     if (type == OFOPERATION_DELETE) {
@@ -3575,7 +3573,6 @@ ofoperation_complete(struct ofoperation *op, enum ofperr error)
     struct ofproto *ofproto = rule->ofproto;
 
     assert(rule->pending == op);
-    assert(op->status < 0);
 
     if (!error
         && !group->error