summaryrefslogtreecommitdiff
path: root/ofproto/ofproto-dpif-xlate.h
diff options
context:
space:
mode:
authorDaniele Venturino <daniele.venturino@m3s.it>2014-08-22 09:01:34 -0700
committerJarno Rajahalme <jrajahalme@nicira.com>2014-09-09 11:45:43 -0700
commit9efd308e957c26ab42a5210cc9fc7300c7d021f0 (patch)
tree7f1d2b8e546413b6f86dd240823afcba6dca806e /ofproto/ofproto-dpif-xlate.h
parent3c33f0ffe76c83f7ec1786175ef34f776892cc0d (diff)
downloadopenvswitch-9efd308e957c26ab42a5210cc9fc7300c7d021f0.tar.gz
Rapid Spanning Tree Protocol (IEEE 802.1D).
This is the v5 from June 12th, 2014, rebased to OVS master, further changes in following patches. Signed-off by: Daniele Venturino <daniele.venturino@m3s.it> Signed-off by: Martino Fornasa <mf@fornasa.it> Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com> Acked-by: Daniele Venturino <daniele.venturino@m3s.it>
Diffstat (limited to 'ofproto/ofproto-dpif-xlate.h')
-rw-r--r--ofproto/ofproto-dpif-xlate.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/ofproto/ofproto-dpif-xlate.h b/ofproto/ofproto-dpif-xlate.h
index b0dfc188a..1ba5a065a 100644
--- a/ofproto/ofproto-dpif-xlate.h
+++ b/ofproto/ofproto-dpif-xlate.h
@@ -147,7 +147,7 @@ void xlate_ofproto_set(struct ofproto_dpif *, const char *name,
struct dpif *, struct rule_dpif *miss_rule,
struct rule_dpif *no_packet_in_rule,
const struct mac_learning *, struct stp *,
- const struct mcast_snooping *,
+ struct rstp *, const struct mcast_snooping *,
const struct mbridge *, const struct dpif_sflow *,
const struct dpif_ipfix *, const struct netflow *,
enum ofp_config_flags, bool forward_bpdu,
@@ -167,7 +167,8 @@ void xlate_ofport_set(struct ofproto_dpif *, struct ofbundle *,
struct ofport_dpif *, ofp_port_t, odp_port_t,
const struct netdev *, const struct cfm *,
const struct bfd *, struct ofport_dpif *peer,
- int stp_port_no, const struct ofproto_port_queue *qdscp,
+ int stp_port_no, int rstp_port_no,
+ const struct ofproto_port_queue *qdscp,
size_t n_qdscp, enum ofputil_port_config,
enum ofputil_port_state, bool is_tunnel,
bool may_enable);