iptables: align xt_CONNMARK with current kernel headers
PATCH 1/1 iptables: align xt_CONNMARK with current kernel headers
libxt_CONNMARK.c declares enum which is declared in the kernel header. Modify the version of the header in the repo's include dir to match the current kernel, and remove the enum declaration from xt_CONNMARK.c.
Signed-off-by Joshua Lant [email protected]
--- extensions/libxt_CONNMARK.c | 5 ----- include/linux/netfilter/xt_CONNMARK.h | 1 + include/linux/netfilter/xt_connmark.h | 19 ++++++++++--------- 3 files changed, 11 insertions(+), 14 deletions(-)
extensions/libxt_CONNMARK.c +0 -5
@@ -31,11 +31,6 @@ struct xt_connmark_target_info {uint8_t mode; }; -enum { -D_SHIFT_LEFT =0 , -D_SHIFT_RIGHT , -}; -enum {O_SET_MARK =0 ,O_SAVE_MARK ,
include/linux/netfilter/xt_CONNMARK.h +1 -0
@@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef _XT_CONNMARK_H_target#define _XT_CONNMARK_H_target
include/linux/netfilter/xt_connmark.h +10 -9
@@ -1,23 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ +/* Copyright (C) 2002,2004 MARA Systems AB <https://www.marasystems.com> +* by Henrik Nordstrom <[email protected]> +*/ + #ifndef _XT_CONNMARK_H #define _XT_CONNMARK_H #include <linux/types.h> -/* Copyright (C) 2002,2004 MARA Systems AB <http://www.marasystems.com> - * by Henrik Nordstrom <[email protected]> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ - enum { XT_CONNMARK_SET = 0, XT_CONNMARK_SAVE, XT_CONNMARK_RESTORE }; +enum { + D_SHIFT_LEFT = 0, + D_SHIFT_RIGHT, +}; + struct xt_connmark_tginfo1 { __u32 ctmark, ctmask, nfmask; __u8 mode;
Signature · 1 line
2.34.1
Quoted 3 lines · Joshua Lant
libxt_CONNMARK.cdeclares enum which is declared in the kernel header. Modify the version of the header in the repo's include dir to match the current kernel, and remove the enum declaration fromxt_CONNMARK.c.
Applied, thanks.