projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: Remove bit-rotted support for "lcov".
[openvswitch]
/
ofproto
/
ofproto-dpif.c
diff --git
a/ofproto/ofproto-dpif.c
b/ofproto/ofproto-dpif.c
index 2451d44d7d8c3ad3cb6e329b5e803e9733e43301..dc15c15bed5ce04eab778c2d7be64a1cb89b405f 100644
(file)
--- a/
ofproto/ofproto-dpif.c
+++ b/
ofproto/ofproto-dpif.c
@@
-3562,6
+3562,11
@@
rule_expire(struct rule_dpif *rule)
long long int now;
uint8_t reason;
long long int now;
uint8_t reason;
+ if (rule->up.pending) {
+ /* We'll have to expire it later. */
+ return;
+ }
+
/* Has 'rule' expired? */
now = time_msec();
if (rule->up.hard_timeout
/* Has 'rule' expired? */
now = time_msec();
if (rule->up.hard_timeout
@@
-5153,7
+5158,7
@@
xlate_output_action(struct action_xlate_ctx *ctx,
compose_output_action(ctx, ctx->flow.in_port);
break;
case OFPP_TABLE:
compose_output_action(ctx, ctx->flow.in_port);
break;
case OFPP_TABLE:
- xlate_table_action(ctx, ctx->flow.in_port,
ctx->table_id
);
+ xlate_table_action(ctx, ctx->flow.in_port,
0
);
break;
case OFPP_NORMAL:
xlate_normal(ctx);
break;
case OFPP_NORMAL:
xlate_normal(ctx);