On Tue, 7 Jan 2025, egyszeregy@xxxxxxxxxxx wrote:
> From: Benjamin Szőke <egyszeregy@xxxxxxxxxxx>
>
> Merge xt_DSCP.h to xt_dscp.h header file.
I think it'd be better worded as "Merge xt_DSCP.h into the xt_dscp.h
header file." (and in the other patches as well).
> Signed-off-by: Benjamin Szőke <egyszeregy@xxxxxxxxxxx>
> ---
> include/uapi/linux/netfilter/xt_DSCP.h | 22 +---------------------
> include/uapi/linux/netfilter/xt_dscp.h | 20 ++++++++++++++++----
> 2 files changed, 17 insertions(+), 25 deletions(-)
>
> diff --git a/include/uapi/linux/netfilter/xt_DSCP.h b/include/uapi/linux/netfilter/xt_DSCP.h
> index 223d635e8b6f..fcff72347256 100644
> --- a/include/uapi/linux/netfilter/xt_DSCP.h
> +++ b/include/uapi/linux/netfilter/xt_DSCP.h
> @@ -1,27 +1,7 @@
> /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
> -/* x_tables module for setting the IPv4/IPv6 DSCP field
> - *
> - * (C) 2002 Harald Welte <laforge@xxxxxxxxxxxx>
> - * based on ipt_FTOS.c (C) 2000 by Matthew G. Marsh <mgm@xxxxxxxxxxxxx>
> - * This software is distributed under GNU GPL v2, 1991
> - *
> - * See RFC2474 for a description of the DSCP field within the IP Header.
> - *
> - * xt_DSCP.h,v 1.7 2002/03/14 12:03:13 laforge Exp
> -*/
> #ifndef _XT_DSCP_TARGET_H
> #define _XT_DSCP_TARGET_H
> -#include <linux/netfilter/xt_dscp.h>
> -#include <linux/types.h>
> -
> -/* target info */
> -struct xt_DSCP_info {
> - __u8 dscp;
> -};
>
> -struct xt_tos_target_info {
> - __u8 tos_value;
> - __u8 tos_mask;
> -};
> +#include <linux/netfilter/xt_dscp.h>
>
> #endif /* _XT_DSCP_TARGET_H */
> diff --git a/include/uapi/linux/netfilter/xt_dscp.h b/include/uapi/linux/netfilter/xt_dscp.h
> index 7594e4df8587..bcfe4afa6351 100644
> --- a/include/uapi/linux/netfilter/xt_dscp.h
> +++ b/include/uapi/linux/netfilter/xt_dscp.h
> @@ -1,15 +1,17 @@
> /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
> -/* x_tables module for matching the IPv4/IPv6 DSCP field
> +/* x_tables module for matching/modifying the IPv4/IPv6 DSCP field
> *
> * (C) 2002 Harald Welte <laforge@xxxxxxxxxxxx>
> + * based on ipt_FTOS.c (C) 2000 by Matthew G. Marsh <mgm@xxxxxxxxxxxxx>
> * This software is distributed under GNU GPL v2, 1991
> *
> * See RFC2474 for a description of the DSCP field within the IP Header.
> *
> + * xt_DSCP.h,v 1.7 2002/03/14 12:03:13 laforge Exp
> * xt_dscp.h,v 1.3 2002/08/05 19:00:21 laforge Exp
> */
For the sake of history it'd worth to prepend the last two lines with
something like: "Original version informations before merging the contents
of the files:"
> -#ifndef _XT_DSCP_H
> -#define _XT_DSCP_H
> +#ifndef _UAPI_XT_DSCP_H
> +#define _UAPI_XT_DSCP_H
In the first four patches you added the _UAPI_ prefix to the header
guards while in the next three ones you kept the original ones. Please
use one style consistently.
> #include <linux/types.h>
>
> @@ -29,4 +31,14 @@ struct xt_tos_match_info {
> __u8 invert;
> };
>
> -#endif /* _XT_DSCP_H */
> +/* target info */
> +struct xt_DSCP_info {
> + __u8 dscp;
> +};
> +
> +struct xt_tos_target_info {
> + __u8 tos_value;
> + __u8 tos_mask;
> +};
> +
> +#endif /* _UAPI_XT_DSCP_H */
> --
> 2.43.5
>
>
Best regards,
Jozsef
--
E-mail : kadlec@xxxxxxxxxxxxx, kadlec@xxxxxxxxxxxxxxxxx, kadlecsik.jozsef@xxxxxxxxx
Address: Wigner Research Centre for Physics
H-1525 Budapest 114, POB. 49, Hungary
