X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ofproto%2Fofproto-dpif.c;h=5265d7bc6e8c005ccf4514013c34a5daec4ac59c;hb=2c0d2b3bfab41a25becdda41b1cf6003a9ebfd00;hp=2451d44d7d8c3ad3cb6e329b5e803e9733e43301;hpb=f25d0cf3c366d92042269a4f787f19c741c2530c;p=openvswitch diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index 2451d44d..5265d7bc 100644 --- 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; + if (rule->up.pending) { + /* We'll have to expire it later. */ + return; + } + /* Has 'rule' expired? */ now = time_msec(); if (rule->up.hard_timeout