[PATCH 04/10] netfilter: x_tables: Use consistent header guard

From: egyszeregy
Date: Mon Jan 06 2025 - 21:43:12 EST


From: Benjamin Szőke <egyszeregy@xxxxxxxxxxx>

Use consistent header guard in xt_connmark.h and xt_mark.h files.

Signed-off-by: Benjamin Szőke <egyszeregy@xxxxxxxxxxx>
---
include/uapi/linux/netfilter/xt_CONNMARK.h | 6 +++---
include/uapi/linux/netfilter/xt_MARK.h | 6 +++---
include/uapi/linux/netfilter/xt_connmark.h | 7 +++----
include/uapi/linux/netfilter/xt_mark.h | 6 +++---
4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/include/uapi/linux/netfilter/xt_CONNMARK.h b/include/uapi/linux/netfilter/xt_CONNMARK.h
index 36cc956ead1a..171af24ef679 100644
--- a/include/uapi/linux/netfilter/xt_CONNMARK.h
+++ b/include/uapi/linux/netfilter/xt_CONNMARK.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef _XT_CONNMARK_H_target
-#define _XT_CONNMARK_H_target
+#ifndef _XT_CONNMARK_TARGET_H
+#define _XT_CONNMARK_TARGET_H

#include <linux/netfilter/xt_connmark.h>

-#endif /*_XT_CONNMARK_H_target*/
+#endif /* _XT_CONNMARK_TARGET_H */
diff --git a/include/uapi/linux/netfilter/xt_MARK.h b/include/uapi/linux/netfilter/xt_MARK.h
index f1fe2b4be933..cdc12c0954b3 100644
--- a/include/uapi/linux/netfilter/xt_MARK.h
+++ b/include/uapi/linux/netfilter/xt_MARK.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef _XT_MARK_H_target
-#define _XT_MARK_H_target
+#ifndef _XT_MARK_H_TARGET_H
+#define _XT_MARK_H_TARGET_H

#include <linux/netfilter/xt_mark.h>

-#endif /*_XT_MARK_H_target */
+#endif /* _XT_MARK_H_TARGET_H */
diff --git a/include/uapi/linux/netfilter/xt_connmark.h b/include/uapi/linux/netfilter/xt_connmark.h
index 41b578ccd03b..a3f03729805b 100644
--- a/include/uapi/linux/netfilter/xt_connmark.h
+++ b/include/uapi/linux/netfilter/xt_connmark.h
@@ -2,9 +2,8 @@
/* Copyright (C) 2002,2004 MARA Systems AB <https://www.marasystems.com>
* by Henrik Nordstrom <hno@xxxxxxxxxxxxxxx>
*/
-
-#ifndef _XT_CONNMARK_H
-#define _XT_CONNMARK_H
+#ifndef _UAPI_XT_CONNMARK_H
+#define _UAPI_XT_CONNMARK_H

#include <linux/types.h>

@@ -34,4 +33,4 @@ struct xt_connmark_mtinfo1 {
__u8 invert;
};

-#endif /*_XT_CONNMARK_H*/
+#endif /* _UAPI_XT_CONNMARK_H */
diff --git a/include/uapi/linux/netfilter/xt_mark.h b/include/uapi/linux/netfilter/xt_mark.h
index 9d0526ced8f0..adcd90b00786 100644
--- a/include/uapi/linux/netfilter/xt_mark.h
+++ b/include/uapi/linux/netfilter/xt_mark.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef _XT_MARK_H
-#define _XT_MARK_H
+#ifndef _UAPI_XT_MARK_H
+#define _UAPI_XT_MARK_H

#include <linux/types.h>

@@ -13,4 +13,4 @@ struct xt_mark_mtinfo1 {
__u8 invert;
};

-#endif /*_XT_MARK_H*/
+#endif /* _UAPI_XT_MARK_H */
--
2.43.5