On Tue, 7 Jan 2025, Szőke Benjamin wrote:
> 2025. 01. 07. 20:26 keltezéssel, Jozsef Kadlecsik írta:
> > On Tue, 7 Jan 2025, egyszeregy@xxxxxxxxxxx wrote:
> >
> > > From: Benjamin Szőke <egyszeregy@xxxxxxxxxxx>
> > >
> > > Merge ipt_ECN.h to ipt_ecn.h header file.
> > >
> > > Signed-off-by: Benjamin Szőke <egyszeregy@xxxxxxxxxxx>
> > > ---
> > > include/uapi/linux/netfilter_ipv4/ipt_ECN.h | 29 +--------------------
> > > include/uapi/linux/netfilter_ipv4/ipt_ecn.h | 26 ++++++++++++++++++
> > > 2 files changed, 27 insertions(+), 28 deletions(-)
> > >
> > > diff --git a/include/uapi/linux/netfilter_ipv4/ipt_ECN.h
> > > b/include/uapi/linux/netfilter_ipv4/ipt_ECN.h
> > > index e3630fd045b8..6727f5a44512 100644
> > > --- a/include/uapi/linux/netfilter_ipv4/ipt_ECN.h
> > > +++ b/include/uapi/linux/netfilter_ipv4/ipt_ECN.h
> > > @@ -1,34 +1,7 @@
> > > /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
> > > -/* Header file for iptables ipt_ECN target
> > > - *
> > > - * (C) 2002 by Harald Welte <laforge@xxxxxxxxxxxx>
> > > - *
> > > - * This software is distributed under GNU GPL v2, 1991
> > > - *
> > > - * ipt_ECN.h,v 1.3 2002/05/29 12:17:40 laforge Exp
> > > -*/
> > > #ifndef _IPT_ECN_TARGET_H
> > > #define _IPT_ECN_TARGET_H
> > > -#include <linux/types.h>
> > > -#include <linux/netfilter/xt_DSCP.h>
> > > -
> > > -#define IPT_ECN_IP_MASK (~XT_DSCP_MASK)
>
> If it is not dropped out in the merged header file, it will cause a build
> error because of the previous bad and duplicated header architects in the
> UAPI:
>
> In file included from ../net/ipv4/netfilter/ipt_ECN.c:17:
> ../include/uapi/linux/netfilter_ipv4/ipt_ecn.h:17:25: error: expected
> identifier before ‘(’ token
> #define IPT_ECN_IP_MASK (~XT_DSCP_MASK)
> ^
> ../include/uapi/linux/netfilter_ipv4/ipt_ecn.h:27:2: note: in expansion of
> macro ‘IPT_ECN_IP_MASK’
> IPT_ECN_IP_MASK = XT_ECN_IP_MASK,
> ^~~~~~~~~~~~~~~
Yes, you are right: from the patches themselves the duplicate macro/enum
definition of IPT_ECN_IP_MASK were not evident.
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
