- uint16_t old_slave_id, ofp_port;
-
- old_slave_id = flow->regs[0];
- ofp_port = bundle_execute(nab, flow, slave_enabled_cb, &sg);
- bundle_execute_load(nab, flow, slave_enabled_cb, &sg);
- if (flow->regs[0] != ofp_port) {
- ovs_fatal(0, "bundle_execute_load() and bundle_execute() "
- "disagree");
- }
+ ofp_port_t old_slave_id, ofp_port;
+ struct flow_wildcards wc;
+
+ old_slave_id = u16_to_ofp(flow->regs[0]);
+ ofp_port = bundle_execute(bundle, flow, &wc, slave_enabled_cb,
+ &sg);
+ flow->regs[0] = ofp_to_u16(ofp_port);