diff options
author | Matteo Croce <mcroce@redhat.com> | 2019-11-02 01:12:04 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-11-05 14:03:11 -0800 |
commit | 54074f1dbd6fbc0f0a085a54f3297ae26e424d59 (patch) | |
tree | 92febdbde61f84d4ff24efe5db7520126522be56 /net/netfilter/xt_HMARK.c | |
parent | 15122464d525f684a61806d28597050cdcef0f32 (diff) | |
download | linux-54074f1dbd6fbc0f0a085a54f3297ae26e424d59.tar.gz linux-54074f1dbd6fbc0f0a085a54f3297ae26e424d59.tar.bz2 linux-54074f1dbd6fbc0f0a085a54f3297ae26e424d59.zip |
icmp: remove duplicate code
The same code which recognizes ICMP error packets is duplicated several
times. Use the icmp_is_err() and icmpv6_is_err() helpers instead, which
do the same thing.
ip_multipath_l3_keys() and tcf_nat_act() didn't check for all the error types,
assume that they should instead.
Signed-off-by: Matteo Croce <mcroce@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/xt_HMARK.c')
-rw-r--r-- | net/netfilter/xt_HMARK.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/netfilter/xt_HMARK.c b/net/netfilter/xt_HMARK.c index be7798a50546..713fb38541df 100644 --- a/net/netfilter/xt_HMARK.c +++ b/net/netfilter/xt_HMARK.c @@ -239,11 +239,7 @@ static int get_inner_hdr(const struct sk_buff *skb, int iphsz, int *nhoff) return 0; /* Error message? */ - if (icmph->type != ICMP_DEST_UNREACH && - icmph->type != ICMP_SOURCE_QUENCH && - icmph->type != ICMP_TIME_EXCEEDED && - icmph->type != ICMP_PARAMETERPROB && - icmph->type != ICMP_REDIRECT) + if (!icmp_is_err(icmph->type)) return 0; *nhoff += iphsz + sizeof(_ih); |