@@ -307,19 +307,19 @@ parse_tc_flower_to_match(struct tc_flower *flower,
match_set_dl_type(match, key->eth_type);
}
- if (key->ip_proto && is_ip_any(&match->flow)) {
- match_set_nw_proto(match, key->ip_proto);
- }
+ if (is_ip_any(&match->flow)) {
+ if (key->ip_proto) {
+ match_set_nw_proto(match, key->ip_proto);
+ }
- match_set_nw_src_masked(match, key->ipv4.ipv4_src, mask->ipv4.ipv4_src);
- match_set_nw_dst_masked(match, key->ipv4.ipv4_dst, mask->ipv4.ipv4_dst);
+ match_set_nw_src_masked(match, key->ipv4.ipv4_src, mask->ipv4.ipv4_src);
+ match_set_nw_dst_masked(match, key->ipv4.ipv4_dst, mask->ipv4.ipv4_dst);
- match_set_ipv6_src_masked(match,
- &key->ipv6.ipv6_src, &mask->ipv6.ipv6_src);
- match_set_ipv6_dst_masked(match,
- &key->ipv6.ipv6_dst, &mask->ipv6.ipv6_dst);
+ match_set_ipv6_src_masked(match,
+ &key->ipv6.ipv6_src, &mask->ipv6.ipv6_src);
+ match_set_ipv6_dst_masked(match,
+ &key->ipv6.ipv6_dst, &mask->ipv6.ipv6_dst);
- if (is_ip_any(&match->flow)) {
if (key->ip_proto == IPPROTO_TCP) {
match_set_tp_dst_masked(match, key->tcp_dst, mask->tcp_dst);
match_set_tp_src_masked(match, key->tcp_src, mask->tcp_src);