From: Benjamin Szőke <egyszeregy@xxxxxxxxxxx> Merge ipt_TTL.h to ipt_ttl.h header file. Signed-off-by: Benjamin Szőke <egyszeregy@xxxxxxxxxxx> --- include/uapi/linux/netfilter_ipv4/ipt_TTL.h | 25 ++++----------------- include/uapi/linux/netfilter_ipv4/ipt_ttl.h | 21 +++++++++++++---- 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/include/uapi/linux/netfilter_ipv4/ipt_TTL.h b/include/uapi/linux/netfilter_ipv4/ipt_TTL.h index 57d2fc67a943..5d989199ed28 100644 --- a/include/uapi/linux/netfilter_ipv4/ipt_TTL.h +++ b/include/uapi/linux/netfilter_ipv4/ipt_TTL.h @@ -1,24 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -/* TTL modification module for IP tables - * (C) 2000 by Harald Welte <laforge@xxxxxxxxxxxxx> */ +#ifndef _IPT_TTL_TARGET_H +#define _IPT_TTL_TARGET_H -#ifndef _IPT_TTL_H -#define _IPT_TTL_H +#include <linux/netfilter_ipv4/ipt_ttl.h> -#include <linux/types.h> - -enum { - IPT_TTL_SET = 0, - IPT_TTL_INC, - IPT_TTL_DEC -}; - -#define IPT_TTL_MAXMODE IPT_TTL_DEC - -struct ipt_TTL_info { - __u8 mode; - __u8 ttl; -}; - - -#endif +#endif /* _IPT_TTL_TARGET_H */ diff --git a/include/uapi/linux/netfilter_ipv4/ipt_ttl.h b/include/uapi/linux/netfilter_ipv4/ipt_ttl.h index ad0226a8629b..c21eb6651353 100644 --- a/include/uapi/linux/netfilter_ipv4/ipt_ttl.h +++ b/include/uapi/linux/netfilter_ipv4/ipt_ttl.h @@ -1,7 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -/* IP tables module for matching the value of the TTL - * (C) 2000 by Harald Welte <laforge@xxxxxxxxxxxx> */ - +/* iptables module for matching/modifying the TTL value + * (C) 2000 by Harald Welte <laforge@xxxxxxxxxxxx> + * (C) 2000 by Harald Welte <laforge@xxxxxxxxxxxxx> + */ #ifndef _IPT_TTL_H #define _IPT_TTL_H @@ -20,5 +21,17 @@ struct ipt_ttl_info { __u8 ttl; }; +enum { + IPT_TTL_SET = 0, + IPT_TTL_INC, + IPT_TTL_DEC +}; + +#define IPT_TTL_MAXMODE IPT_TTL_DEC + +struct ipt_TTL_info { + __u8 mode; + __u8 ttl; +}; -#endif +#endif /* _IPT_TTL_H */ -- 2.43.5