Re: [PATCH 08/10] netfilter: Adjust code style of xt_*.h, ipt_*.h files.

[Jozsef Kadlecsik <kadlec@netfilter.org>]

[-- Attachment #1: Type: text/plain, Size: 4784 bytes --]

On Tue, 7 Jan 2025, egyszeregy@freemail.hu wrote:

> From: Benjamin Szőke <egyszeregy@freemail.hu>
> 
> - Adjust tab indents
> - Fix format of #define macros

I don't really understand why it'd be important to use parentheses around 
plain constant values in macros. The kernel coding style does not list it 
as a requirement, see 12) 4. in Documentation/process/coding-style.rst.

Best regards,
Jozsef
 
> Signed-off-by: Benjamin Szőke <egyszeregy@freemail.hu>
> ---
>  include/uapi/linux/netfilter/xt_dscp.h      | 6 +++---
>  include/uapi/linux/netfilter/xt_rateest.h   | 4 ++--
>  include/uapi/linux/netfilter/xt_tcpmss.h    | 6 +++---
>  include/uapi/linux/netfilter_ipv4/ipt_ecn.h | 8 ++++----
>  include/uapi/linux/netfilter_ipv4/ipt_ttl.h | 3 +--
>  include/uapi/linux/netfilter_ipv6/ip6t_hl.h | 3 +--
>  6 files changed, 14 insertions(+), 16 deletions(-)
> 
> diff --git a/include/uapi/linux/netfilter/xt_dscp.h b/include/uapi/linux/netfilter/xt_dscp.h
> index bcfe4afa6351..22b6488ef2e7 100644
> --- a/include/uapi/linux/netfilter/xt_dscp.h
> +++ b/include/uapi/linux/netfilter/xt_dscp.h
> @@ -15,9 +15,9 @@
>  
>  #include <linux/types.h>
>  
> -#define XT_DSCP_MASK	0xfc	/* 11111100 */
> -#define XT_DSCP_SHIFT	2
> -#define XT_DSCP_MAX	0x3f	/* 00111111 */
> +#define XT_DSCP_MASK	(0xfc)	/* 11111100 */
> +#define XT_DSCP_SHIFT	(2)
> +#define XT_DSCP_MAX		(0x3f)	/* 00111111 */
>  
>  /* match info */
>  struct xt_dscp_info {
> diff --git a/include/uapi/linux/netfilter/xt_rateest.h b/include/uapi/linux/netfilter/xt_rateest.h
> index da9727fa527b..f719bd501d1a 100644
> --- a/include/uapi/linux/netfilter/xt_rateest.h
> +++ b/include/uapi/linux/netfilter/xt_rateest.h
> @@ -22,8 +22,8 @@ enum xt_rateest_match_mode {
>  };
>  
>  struct xt_rateest_match_info {
> -	char			name1[IFNAMSIZ];
> -	char			name2[IFNAMSIZ];
> +	char		name1[IFNAMSIZ];
> +	char		name2[IFNAMSIZ];
>  	__u16		flags;
>  	__u16		mode;
>  	__u32		bps1;
> diff --git a/include/uapi/linux/netfilter/xt_tcpmss.h b/include/uapi/linux/netfilter/xt_tcpmss.h
> index 3ee4acaa6e03..ad858ae93e6a 100644
> --- a/include/uapi/linux/netfilter/xt_tcpmss.h
> +++ b/include/uapi/linux/netfilter/xt_tcpmss.h
> @@ -4,11 +4,11 @@
>  
>  #include <linux/types.h>
>  
> -#define XT_TCPMSS_CLAMP_PMTU	0xffff
> +#define XT_TCPMSS_CLAMP_PMTU	(0xffff)
>  
>  struct xt_tcpmss_match_info {
> -    __u16 mss_min, mss_max;
> -    __u8 invert;
> +	__u16 mss_min, mss_max;
> +	__u8 invert;
>  };
>  
>  struct xt_tcpmss_info {
> diff --git a/include/uapi/linux/netfilter_ipv4/ipt_ecn.h b/include/uapi/linux/netfilter_ipv4/ipt_ecn.h
> index a6d479aece21..0594dd49d13f 100644
> --- a/include/uapi/linux/netfilter_ipv4/ipt_ecn.h
> +++ b/include/uapi/linux/netfilter_ipv4/ipt_ecn.h
> @@ -16,10 +16,10 @@
>  
>  #define ipt_ecn_info xt_ecn_info
>  
> -#define IPT_ECN_OP_SET_IP	0x01	/* set ECN bits of IPv4 header */
> -#define IPT_ECN_OP_SET_ECE	0x10	/* set ECE bit of TCP header */
> -#define IPT_ECN_OP_SET_CWR	0x20	/* set CWR bit of TCP header */
> -#define IPT_ECN_OP_MASK		0xce
> +#define IPT_ECN_OP_SET_IP	(0x01)	/* set ECN bits of IPv4 header */
> +#define IPT_ECN_OP_SET_ECE	(0x10)	/* set ECE bit of TCP header */
> +#define IPT_ECN_OP_SET_CWR	(0x20)	/* set CWR bit of TCP header */
> +#define IPT_ECN_OP_MASK		(0xce)
>  
>  enum {
>  	IPT_ECN_IP_MASK       = XT_ECN_IP_MASK,
> diff --git a/include/uapi/linux/netfilter_ipv4/ipt_ttl.h b/include/uapi/linux/netfilter_ipv4/ipt_ttl.h
> index c21eb6651353..15c75a4ba355 100644
> --- a/include/uapi/linux/netfilter_ipv4/ipt_ttl.h
> +++ b/include/uapi/linux/netfilter_ipv4/ipt_ttl.h
> @@ -9,13 +9,12 @@
>  #include <linux/types.h>
>  
>  enum {
> -	IPT_TTL_EQ = 0,		/* equals */
> +	IPT_TTL_EQ = 0,	/* equals */
>  	IPT_TTL_NE,		/* not equals */
>  	IPT_TTL_LT,		/* less than */
>  	IPT_TTL_GT,		/* greater than */
>  };
>  
> -
>  struct ipt_ttl_info {
>  	__u8	mode;
>  	__u8	ttl;
> diff --git a/include/uapi/linux/netfilter_ipv6/ip6t_hl.h b/include/uapi/linux/netfilter_ipv6/ip6t_hl.h
> index caef38a63b8f..4af05c86dcd5 100644
> --- a/include/uapi/linux/netfilter_ipv6/ip6t_hl.h
> +++ b/include/uapi/linux/netfilter_ipv6/ip6t_hl.h
> @@ -9,13 +9,12 @@
>  #include <linux/types.h>
>  
>  enum {
> -	IP6T_HL_EQ = 0,		/* equals */
> +	IP6T_HL_EQ = 0,	/* equals */
>  	IP6T_HL_NE,		/* not equals */
>  	IP6T_HL_LT,		/* less than */
>  	IP6T_HL_GT,		/* greater than */
>  };
>  
> -
>  struct ip6t_hl_info {
>  	__u8	mode;
>  	__u8	hop_limit;
> -- 
> 2.43.5
> 
> 

-- 
E-mail : kadlec@netfilter.org, kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.hu
Address: Wigner Research Centre for Physics
         H-1525 Budapest 114, POB. 49, Hungary