diff options
| author | Jarno Rajahalme <jarno@ovn.org> | 2016-09-15 13:59:52 -0700 |
|---|---|---|
| committer | Jarno Rajahalme <jarno@ovn.org> | 2016-09-15 13:59:52 -0700 |
| commit | 0c78eebea4dd240392567fe9c452d659468f6a6d (patch) | |
| tree | 7d031a27cd0e38ccb002d4479412de97723ed6e6 /ofproto/connmgr.c | |
| parent | f069903d28eeb3067ad3842cf0095a3692a5eb61 (diff) | |
| download | openvswitch-0c78eebea4dd240392567fe9c452d659468f6a6d.tar.gz | |
ofproto: Remove double reporting from bundles.
Patch b0d38b2f17 unified flow mod reporting in ofproto for both
stand-alone flow mods and bundle flow mods, but left bundle-specific
reporting to the bundle removal code. This patch fixes this by
removing the bundle-specific reporting of flow mods.
Found by inspection.
Fixes: b0d38b2f17 ("ofproto: Report flow mods also from bundles.")
Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'ofproto/connmgr.c')
| -rw-r--r-- | ofproto/connmgr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c index 637724541..4b927d64b 100644 --- a/ofproto/connmgr.c +++ b/ofproto/connmgr.c @@ -1234,7 +1234,7 @@ bundle_remove_all(struct ofconn *ofconn) struct ofp_bundle *b, *next; HMAP_FOR_EACH_SAFE (b, next, node, &ofconn->bundles) { - ofp_bundle_remove__(ofconn, b, false); + ofp_bundle_remove__(ofconn, b); } } @@ -1247,7 +1247,7 @@ bundle_remove_expired(struct ofconn *ofconn, long long int now) HMAP_FOR_EACH_SAFE (b, next, node, &ofconn->bundles) { if (b->used <= limit) { ofconn_send_error(ofconn, &b->ofp_msg, OFPERR_OFPBFC_TIMEOUT); - ofp_bundle_remove__(ofconn, b, false); + ofp_bundle_remove__(ofconn, b); } } } |