From 6beb459a439276734eabfb4975e42d336bb0317a Mon Sep 17 00:00:00 2001 From: Zhe Weng Date: Wed, 28 Feb 2024 17:47:55 +0800 Subject: [PATCH] netfilter: Move IP6T_F to correct file Ref: https://github.com/torvalds/linux/blob/v6.7/include/uapi/linux/netfilter_ipv6/ip6_tables.h#L91-L95 Signed-off-by: Zhe Weng --- include/nuttx/net/netfilter/ip6_tables.h | 7 +++++++ include/nuttx/net/netfilter/ip_tables.h | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/nuttx/net/netfilter/ip6_tables.h b/include/nuttx/net/netfilter/ip6_tables.h index 2bc9ece045..69be30af9a 100644 --- a/include/nuttx/net/netfilter/ip6_tables.h +++ b/include/nuttx/net/netfilter/ip6_tables.h @@ -47,6 +47,13 @@ #define IP6T_SO_GET_REVISION_TARGET (IP6T_BASE_CTL + 5) #define IP6T_SO_GET_MAX IP6T_SO_GET_REVISION_TARGET +/* Values for "flag" field in struct ip6t_ip6 (general ip6 structure). */ + +#define IP6T_F_PROTO 0x01 /* Set if rule cares about upper protocols */ +#define IP6T_F_TOS 0x02 /* Match the TOS. */ +#define IP6T_F_GOTO 0x04 /* Set if jump is a goto */ +#define IP6T_F_MASK 0x07 /* All possible flag bits mask. */ + /* Values for "inv" field in struct ip6t_ip6. */ #define IP6T_INV_VIA_IN 0x01 /* Invert the sense of IN IFACE. */ diff --git a/include/nuttx/net/netfilter/ip_tables.h b/include/nuttx/net/netfilter/ip_tables.h index d5017fa6ea..a8dbac3208 100644 --- a/include/nuttx/net/netfilter/ip_tables.h +++ b/include/nuttx/net/netfilter/ip_tables.h @@ -47,13 +47,6 @@ #define IPT_SO_GET_REVISION_TARGET (IPT_BASE_CTL + 3) #define IPT_SO_GET_MAX IPT_SO_GET_REVISION_TARGET -/* Values for "flag" field in struct ip6t_ip6 (general ip6 structure). */ - -#define IP6T_F_PROTO 0x01 /* Set if rule cares about upper protocols */ -#define IP6T_F_TOS 0x02 /* Match the TOS. */ -#define IP6T_F_GOTO 0x04 /* Set if jump is a goto */ -#define IP6T_F_MASK 0x07 /* All possible flag bits mask. */ - /* Values for "inv" field in struct ipt_ip. */ #define IPT_INV_VIA_IN 0x01 /* Invert the sense of IN IFACE. */