Acked-by: Jarno Rajahalme <jrajaha...@nicira.com>
On Sep 16, 2013, at 2:59 PM, Ben Pfaff <b...@nicira.com> wrote:
> Signed-off-by: Ben Pfaff <b...@nicira.com>
> ---
> ofproto/ofproto-dpif.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
> index b41c179..28dc661 100644
> --- a/ofproto/ofproto-dpif.c
> +++ b/ofproto/ofproto-dpif.c
> @@ -1079,8 +1079,6 @@ dealloc(struct ofproto *ofproto_)
> static void
> close_dpif_backer(struct dpif_backer *backer)
> {
> - struct shash_node *node;
> -
> ovs_assert(backer->refcount > 0);
>
> if (--backer->refcount) {
> @@ -1095,9 +1093,8 @@ close_dpif_backer(struct dpif_backer *backer)
> simap_destroy(&backer->tnl_backers);
> ovs_rwlock_destroy(&backer->odp_to_ofport_lock);
> hmap_destroy(&backer->odp_to_ofport_map);
> - node = shash_find(&all_dpif_backers, backer->type);
> + shash_find_and_delete(&all_dpif_backers, backer->type);
> free(backer->type);
> - shash_delete(&all_dpif_backers, node);
> dpif_close(backer->dpif);
>
> ovs_assert(hmap_is_empty(&backer->subfacets));
> --
> 1.7.10.4
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
