Setting tag sliver-openvswitch-2.2.90-1

[sliver-openvswitch.git] / lib / bundle.c

diff --git a/lib/bundle.c b/lib/bundle.c
index 9aec8c9..60a360e 100644 (file)
--- a/lib/bundle.c
+++ b/lib/bundle.c
@@ -99,7 +99,7 @@ bundle_execute(const struct ofpact_bundle *bundle,
         return execute_ab(bundle, slave_enabled, aux);
 
     default:
-        NOT_REACHED();
+        OVS_NOT_REACHED();
     }
 }
 
@@ -177,7 +177,7 @@ bundle_from_openflow(const struct nx_action_bundle *nab,
         ofpbuf_put(ofpacts, &ofp_port, sizeof ofp_port);
     }
 
-    bundle = ofpacts->l2;
+    bundle = ofpacts->frame;
     ofpact_update_len(ofpacts, &bundle->ofpact);
 
     if (!error) {
@@ -288,7 +288,7 @@ bundle_parse__(const char *s, char **save_ptr,
         }
         ofpbuf_put(ofpacts, &slave_port, sizeof slave_port);
 
-        bundle = ofpacts->l2;
+        bundle = ofpacts->frame;
         bundle->n_slaves++;
     }
     ofpact_update_len(ofpacts, &bundle->ofpact);