From: YueHaibing <yuehaibing@huawei.com>
Date: Thu, 27 Aug 2020 14:08:13 +0000 (+0800)
Subject: netfilter: xt_HMARK: Use ip_is_fragment() helper
X-Git-Tag: v5.10-rc1~107^2~333^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f5143e10a2e41f70ed6b1f3bbd8119ede5240c80;p=thirdparty%2Fkernel%2Flinux.git

netfilter: xt_HMARK: Use ip_is_fragment() helper

Use ip_is_fragment() to simpify code.

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/net/netfilter/xt_HMARK.c b/net/netfilter/xt_HMARK.c
index 713fb38541dfc..8928ec56c3888 100644
--- a/net/netfilter/xt_HMARK.c
+++ b/net/netfilter/xt_HMARK.c
@@ -276,7 +276,7 @@ hmark_pkt_set_htuple_ipv4(const struct sk_buff *skb, struct hmark_tuple *t,
 		return 0;
 
 	/* follow-up fragments don't contain ports, skip all fragments */
-	if (ip->frag_off & htons(IP_MF | IP_OFFSET))
+	if (ip_is_fragment(ip))
 		return 0;
 
 	hmark_set_tuple_ports(skb, (ip->ihl * 4) + nhoff, t, info);