X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=ofproto%2Fbundles.h;h=1b2e3337b59762f47496b316c7d1a3c386507ea3;hb=eda26d40ae086539e7de3770818f80580fc231b3;hp=0c7daf288416be4172c8caca84f7b04f593632da;hpb=39c9459355b6f010aa73ca80ad8d0e6893ef0a88;p=cascardo%2Fovs.git

diff --git a/ofproto/bundles.h b/ofproto/bundles.h
index 0c7daf288..1b2e3337b 100644
--- a/ofproto/bundles.h
+++ b/ofproto/bundles.h
@@ -35,14 +35,10 @@ struct ofp_bundle_entry {
     struct ovs_list   node;
     enum ofptype      type;  /* OFPTYPE_FLOW_MOD or OFPTYPE_PORT_MOD. */
     union {
-        struct ofputil_flow_mod fm;   /* 'fm.ofpacts' must be malloced. */
-        struct ofputil_port_mod pm;
+        struct ofproto_flow_mod ofm;   /* ofm.fm.ofpacts must be malloced. */
+        struct ofproto_port_mod opm;
     };
 
-    /* Used during commit. */
-    struct rule_collection old_rules;   /* Affected rules. */
-    struct rule_collection new_rules;   /* Affected rules. */
-
     /* OpenFlow header and some of the message contents for error reporting. */
     struct ofp_header ofp_msg[DIV_ROUND_UP(64, sizeof(struct ofp_header))];
 };
@@ -92,7 +88,7 @@ ofp_bundle_entry_free(struct ofp_bundle_entry *entry)
 {
     if (entry) {
         if (entry->type == OFPTYPE_FLOW_MOD) {
-            free(entry->fm.ofpacts);
+            free(entry->ofm.fm.ofpacts);
         }
         free(entry);
     }