From 1fe42975639854bc6cf4784b2554b438301c0b92 Mon Sep 17 00:00:00 2001 From: Roi Dayan Date: Tue, 16 Jun 2020 16:03:57 +0300 Subject: netdev-offload-tc: Revert tunnel src/dst port masks handling The cited commit intended to add tc support for masking tunnel src/dst ips and ports. It's not possible to do tunnel ports masking with openflow rules and the default mask for tunnel ports set to 0 in tnl_wc_init(), unlike tunnel ports default mask which is full mask. So instead of never passing tunnel ports to tc, revert the changes to tunnel ports to always pass the tunnel port. In sw classification is done by the kernel, but for hw we must match the tunnel dst port. Fixes: 5f568d049130 ("netdev-offload-tc: Allow to match the IP and port mask of tunnel") Signed-off-by: Roi Dayan Reviewed-by: Eli Britstein Signed-off-by: Simon Horman --- include/openvswitch/match.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'include') diff --git a/include/openvswitch/match.h b/include/openvswitch/match.h index 9e480318e..2e8812048 100644 --- a/include/openvswitch/match.h +++ b/include/openvswitch/match.h @@ -105,9 +105,6 @@ void match_set_tun_flags(struct match *match, uint16_t flags); void match_set_tun_flags_masked(struct match *match, uint16_t flags, uint16_t mask); void match_set_tun_tp_dst(struct match *match, ovs_be16 tp_dst); void match_set_tun_tp_dst_masked(struct match *match, ovs_be16 port, ovs_be16 mask); -void match_set_tun_tp_src(struct match *match, ovs_be16 tp_src); -void match_set_tun_tp_src_masked(struct match *match, - ovs_be16 port, ovs_be16 mask); void match_set_tun_gbp_id_masked(struct match *match, ovs_be16 gbp_id, ovs_be16 mask); void match_set_tun_gbp_id(struct match *match, ovs_be16 gbp_id); void match_set_tun_gbp_flags_masked(struct match *match, uint8_t flags, uint8_t mask); -- cgit v1.2.1