/*
- * Copyright (c) 2011-2014 M3S, Srl - Italy
+ * Copyright (c) 2011-2015 M3S, Srl - Italy
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* Authors:
* Martino Fornasa <mf@fornasa.it>
* Daniele Venturino <daniele.venturino@m3s.it>
+ * Carlo Andreotti <c.andreotti@m3s.it>
*
* References to IEEE 802.1D-2004 standard are enclosed in square brackets.
* E.g. [17.3], [Table 17-1], etc.
#include <sys/types.h>
#include "byte-order.h"
#include "connectivity.h"
-#include "ofpbuf.h"
+#include "openvswitch/ofpbuf.h"
#include "ofproto/ofproto.h"
#include "dp-packet.h"
#include "packets.h"
* means that there should be not ports at this time. */
ovs_assert(hmap_is_empty(&rstp->ports));
- list_remove(&rstp->node);
+ ovs_list_remove(&rstp->node);
ovs_mutex_unlock(&rstp_mutex);
+ hmap_destroy(&rstp->ports);
free(rstp->name);
free(rstp);
}
rstp->aux = aux;
rstp->changes = false;
rstp->begin = true;
+ rstp->old_root_aux = NULL;
+ rstp->new_root_aux = NULL;
ovs_refcount_init(&rstp->ref_cnt);
- list_push_back(all_rstps, &rstp->node);
+ ovs_list_push_back(all_rstps, &rstp->node);
ovs_mutex_unlock(&rstp_mutex);
VLOG_DBG("RSTP instance creation done");