For non UDP tunnels as GRE there is no UDP port, i.e initialized to 0.
Do not set the port attribute in such case.
Signed-off-by: Eli Britstein <el...@mellanox.com>
---
lib/netdev-tc-offloads.c | 6 ++++--
lib/tc.c | 8 ++++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/lib/netdev-tc-offloads.c b/lib/netdev-tc-offloads.c
index 606a4f4db..5e6f69951 100644
--- a/lib/netdev-tc-offloads.c
+++ b/lib/netdev-tc-offloads.c
@@ -651,8 +651,10 @@ parse_tc_flower_to_match(struct tc_flower *flower,
nl_msg_put_u8(buf, OVS_TUNNEL_KEY_ATTR_TTL,
action->encap.ttl);
}
- nl_msg_put_be16(buf, OVS_TUNNEL_KEY_ATTR_TP_DST,
- action->encap.tp_dst);
+ if (action->encap.tp_dst) {
+ nl_msg_put_be16(buf, OVS_TUNNEL_KEY_ATTR_TP_DST,
+ action->encap.tp_dst);
+ }
if (!action->encap.no_csum) {
nl_msg_put_u8(buf, OVS_TUNNEL_KEY_ATTR_CSUM,
!action->encap.no_csum);
diff --git a/lib/tc.c b/lib/tc.c
index 47127ca2c..5681ee096 100644
--- a/lib/tc.c
+++ b/lib/tc.c
@@ -1661,7 +1661,9 @@ nl_msg_put_act_tunnel_key_set(struct ofpbuf *request,
ovs_be64 id,
if (ttl) {
nl_msg_put_u8(request, TCA_TUNNEL_KEY_ENC_TTL, ttl);
}
- nl_msg_put_be16(request, TCA_TUNNEL_KEY_ENC_DST_PORT, tp_dst);
+ if (tp_dst) {
+ nl_msg_put_be16(request, TCA_TUNNEL_KEY_ENC_DST_PORT, tp_dst);
+ }
nl_msg_put_act_tunnel_geneve_option(request, tun_metadata);
nl_msg_put_u8(request, TCA_TUNNEL_KEY_NO_CSUM, no_csum);
}
@@ -2035,7 +2037,9 @@ nl_msg_put_flower_tunnel(struct ofpbuf *request, struct
tc_flower *flower)
nl_msg_put_u8(request, TCA_FLOWER_KEY_ENC_IP_TTL, ttl);
nl_msg_put_u8(request, TCA_FLOWER_KEY_ENC_IP_TTL_MASK, ttl_mask);
}
- nl_msg_put_be16(request, TCA_FLOWER_KEY_ENC_UDP_DST_PORT, tp_dst);
+ if (tp_dst) {
+ nl_msg_put_be16(request, TCA_FLOWER_KEY_ENC_UDP_DST_PORT, tp_dst);
+ }
nl_msg_put_be32(request, TCA_FLOWER_KEY_ENC_KEY_ID, id);
nl_msg_put_flower_tunnel_opts(request, TCA_FLOWER_KEY_ENC_OPTS,
flower->key.tunnel.metadata);
--
2.14.5
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
