It requires ofproto-dpif-xlate to poke into 'struct ofproto-dpif'
which won't be allowed in future patches. It's also a case of
premature optimization.
Signed-off-by: Ethan Jackson <et...@nicira.com>
---
ofproto/ofproto-dpif-xlate.c | 1 -
ofproto/ofproto-dpif.c | 7 +------
ofproto/ofproto-dpif.h | 1 -
3 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
index ab0a738..df8964f 100644
--- a/ofproto/ofproto-dpif-xlate.c
+++ b/ofproto/ofproto-dpif-xlate.c
@@ -1694,7 +1694,6 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t
ofpacts_len,
break;
case OFPACT_BUNDLE:
- ctx->ofproto->has_bundle_action = true;
xlate_bundle_action(ctx, ofpact_get_BUNDLE(a));
break;
diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index 70f8422..77b9adf 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -1038,8 +1038,6 @@ construct(struct ofproto *ofproto_)
ofproto_dpif_unixctl_init();
- ofproto->has_bundle_action = false;
-
hmap_init(&ofproto->vlandev_map);
hmap_init(&ofproto->realdev_vid_map);
@@ -2725,10 +2723,7 @@ port_run(struct ofport_dpif *ofport)
if (ofport->may_enable != enable) {
struct ofproto_dpif *ofproto = ofproto_dpif_cast(ofport->up.ofproto);
-
- if (ofproto->has_bundle_action) {
- ofproto->backer->need_revalidate = REV_PORT_TOGGLED;
- }
+ ofproto->backer->need_revalidate = REV_PORT_TOGGLED;
}
ofport->may_enable = enable;
diff --git a/ofproto/ofproto-dpif.h b/ofproto/ofproto-dpif.h
index 8b9b40e..952f3a2 100644
--- a/ofproto/ofproto-dpif.h
+++ b/ofproto/ofproto-dpif.h
@@ -93,7 +93,6 @@ struct ofproto_dpif {
/* Support for debugging async flow mods. */
struct list completions;
- bool has_bundle_action; /* True when the first bundle action appears. */
struct netdev_stats stats; /* To account packets generated and consumed in
* userspace. */
--
1.7.9.5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
