projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: add ipv6 'set' action
[openvswitch]
/
lib
/
netdev-vport.c
diff --git
a/lib/netdev-vport.c
b/lib/netdev-vport.c
index ed20a48e873ecf487500b7e1526f22f780cfeba8..5171171d9e08866c9ea0192fb47c9decabdfa49d 100644
(file)
--- a/
lib/netdev-vport.c
+++ b/
lib/netdev-vport.c
@@
-173,6
+173,7
@@
netdev_vport_get_netdev_type(const struct dpif_linux_vport *vport)
case OVS_VPORT_TYPE_CAPWAP:
return "capwap";
case OVS_VPORT_TYPE_CAPWAP:
return "capwap";
+ case OVS_VPORT_TYPE_FT_GRE:
case __OVS_VPORT_TYPE_MAX:
break;
}
case __OVS_VPORT_TYPE_MAX:
break;
}
@@
-594,14
+595,13
@@
parse_tunnel_config(const char *name, const char *type,
VLOG_WARN_ONCE("CAPWAP tunnel support is deprecated.");
}
VLOG_WARN_ONCE("CAPWAP tunnel support is deprecated.");
}
- flags = TNL_F_DF_DEFAULT
| TNL_F_HDR_CACHE
;
+ flags = TNL_F_DF_DEFAULT;
if (!strcmp(type, "gre") || !strcmp(type, "gre64")) {
is_gre = true;
} else if (!strcmp(type, "ipsec_gre") || !strcmp(type, "ipsec_gre64")) {
is_gre = true;
is_ipsec = true;
flags |= TNL_F_IPSEC;
if (!strcmp(type, "gre") || !strcmp(type, "gre64")) {
is_gre = true;
} else if (!strcmp(type, "ipsec_gre") || !strcmp(type, "ipsec_gre64")) {
is_gre = true;
is_ipsec = true;
flags |= TNL_F_IPSEC;
- flags &= ~TNL_F_HDR_CACHE;
}
SMAP_FOR_EACH (node, args) {
}
SMAP_FOR_EACH (node, args) {
@@
-658,10
+658,6
@@
parse_tunnel_config(const char *name, const char *type,
"concerns.", name);
flags |= TNL_F_PMTUD;
}
"concerns.", name);
flags |= TNL_F_PMTUD;
}
- } else if (!strcmp(node->key, "header_cache")) {
- if (!strcmp(node->value, "false")) {
- flags &= ~TNL_F_HDR_CACHE;
- }
} else if (!strcmp(node->key, "peer_cert") && is_ipsec) {
if (smap_get(args, "certificate")) {
ipsec_mech_set = true;
} else if (!strcmp(node->key, "peer_cert") && is_ipsec) {
if (smap_get(args, "certificate")) {
ipsec_mech_set = true;
@@
-792,11
+788,6
@@
unparse_tunnel_config(const char *name OVS_UNUSED, const char *type OVS_UNUSED,
return error;
}
return error;
}
- flags = nl_attr_get_u32(a[OVS_TUNNEL_ATTR_FLAGS]);
- if (!(flags & TNL_F_HDR_CACHE) == !(flags & TNL_F_IPSEC)) {
- smap_add(args, "header_cache",
- flags & TNL_F_HDR_CACHE ? "true" : "false");
- }
daddr = nl_attr_get_be32(a[OVS_TUNNEL_ATTR_DST_IPV4]);
smap_add_format(args, "remote_ip", IP_FMT, IP_ARGS(&daddr));
daddr = nl_attr_get_be32(a[OVS_TUNNEL_ATTR_DST_IPV4]);
smap_add_format(args, "remote_ip", IP_FMT, IP_ARGS(&daddr));
@@
-829,6
+820,7
@@
unparse_tunnel_config(const char *name OVS_UNUSED, const char *type OVS_UNUSED,
}
}
}
}
+ flags = nl_attr_get_u32(a[OVS_TUNNEL_ATTR_FLAGS]);
if (flags & TNL_F_TTL_INHERIT) {
smap_add(args, "ttl", "inherit");
} else if (a[OVS_TUNNEL_ATTR_TTL]) {
if (flags & TNL_F_TTL_INHERIT) {
smap_add(args, "ttl", "inherit");
} else if (a[OVS_TUNNEL_ATTR_TTL]) {