This patch disables features which are not currently supported in the windows datapath.
Unfortunately we have to do it in userspace because dpif_probe_feature is not treated accordingly in the windows the datapath. I opened the issue to track the feature for later implementations: https://github.com/openvswitch/ovs-issues/issues/85 Signed-off-by: Alin Gabriel Serdean <aserd...@cloudbasesolutions.com> --- v3: Add Sign-off-by v2: Rebase --- --- ofproto/ofproto-dpif.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index 369e0b9..6cdaa32 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -1010,8 +1010,14 @@ check_recirc(struct dpif_backer *backer) ofpbuf_use_stack(&key, &keybuf, sizeof keybuf); odp_flow_key_from_flow(&key, &flow, NULL, 0, true); +#ifdef _WIN32 + /* XXX Force disable of datapath recirculation from userspace until the + * dpif_probe_feature is properly implemented in the windows datapath */ + enable_recirc = false; +#else enable_recirc = dpif_probe_feature(backer->dpif, "recirculation", &key, NULL); +#endif if (enable_recirc) { VLOG_INFO("%s: Datapath supports recirculation", @@ -1045,7 +1051,13 @@ check_ufid(struct dpif_backer *backer) odp_flow_key_from_flow(&key, &flow, NULL, 0, true); dpif_flow_hash(backer->dpif, key.data, key.size, &ufid); +#ifdef _WIN32 + /* XXX Force disable of datapath recirculation from userspace until the + * dpif_probe_feature is properly implemented in the windows datapath */ + enable_ufid = false; +#else enable_ufid = dpif_probe_feature(backer->dpif, "UFID", &key, &ufid); +#endif if (enable_ufid) { VLOG_INFO("%s: Datapath supports unique flow ids", @@ -1151,6 +1163,11 @@ check_max_mpls_depth(struct dpif_backer *backer) ofpbuf_use_stack(&key, &keybuf, sizeof keybuf); odp_flow_key_from_flow(&key, &flow, NULL, 0, false); +#ifdef _WIN32 + /* XXX Force disable of datapath recirculation from userspace until the + * dpif_probe_feature is properly implemented in the windows datapath */ + break; +#endif if (!dpif_probe_feature(backer->dpif, "MPLS", &key, NULL)) { break; } -- 1.9.5.msysgit.0 _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
