2015-11-26 16:36:34

by Jitendra

Subject: [PATCH] staging: net: core: skbuff.c: Added do-while pair for complex macros

This patch is to file skbuff.c that fixes up following error,
reported by checkpatch.pl tool,

1. ERROR: Macros with multiple statements should be enclosed
in a do - while loop.

Signed-off-by: Jitendra Kumar Khasdev <[email protected]>
---
net/core/skbuff.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index aa41e6d..4d31228 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -748,11 +748,13 @@ void consume_skb(struct sk_buff *skb)
EXPORT_SYMBOL(consume_skb);

/* Make sure a field is enclosed inside headers_start/headers_end section */
-#define CHECK_SKB_FIELD(field) \
- BUILD_BUG_ON(offsetof(struct sk_buff, field) < \
- offsetof(struct sk_buff, headers_start)); \
- BUILD_BUG_ON(offsetof(struct sk_buff, field) > \
- offsetof(struct sk_buff, headers_end)); \
+#define CHECK_SKB_FIELD(field) \
+ do { \
+ BUILD_BUG_ON(offsetof(struct sk_buff, field) < \
+ offsetof(struct sk_buff, headers_start)); \
+ BUILD_BUG_ON(offsetof(struct sk_buff, field) > \
+ offsetof(struct sk_buff, headers_end)); \
+ } while (0) \

static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old)
{
--
1.9.1

2015-11-26 17:00:31

by Joe Perches

Subject: Re: [PATCH] staging: net: core: skbuff.c: Added do-while pair for complex macros

On Thu, 2015-11-26 at 22:06 +0530, Jitendra Kumar Khasdev wrote:
> This patch is to file skbuff.c that fixes up following error,
> reported by checkpatch.pl tool,

Your subject title is not correct.
This is not a staging patch.

> 1. ERROR: Macros with multiple statements should be enclosed
> in a do - while loop.

checkpatch is brainless.
Not every message it emits needs fixing.


> diff --git a/net/core/skbuff.c b/net/core/skbuff.c
[]
> @@ -748,11 +748,13 @@ void consume_skb(struct sk_buff *skb)
> EXPORT_SYMBOL(consume_skb);
>
> /* Make sure a field is enclosed inside headers_start/headers_end section */
> -#define CHECK_SKB_FIELD(field) \
> - BUILD_BUG_ON(offsetof(struct sk_buff, field) < \
> - offsetof(struct sk_buff, headers_start)); \
> - BUILD_BUG_ON(offsetof(struct sk_buff, field) > \
> - offsetof(struct sk_buff, headers_end)); \
> +#define CHECK_SKB_FIELD(field) \
> + do { \
> + BUILD_BUG_ON(offsetof(struct sk_buff, field) < \
> + offsetof(struct sk_buff, headers_start)); \
> + BUILD_BUG_ON(offsetof(struct sk_buff, field) > \
> + offsetof(struct sk_buff, headers_end)); \
> + } while (0) \

Perhaps the last check should add a sizeof(field)

BUILD_BUG_ON((offsetof(struct sk_buff, field) +
FIELD_SIZEOF(struct sk_buff, field)) >
offsetof(struct sk_buff, headers_end));

2015-11-26 21:43:11

by David Miller

Subject: Re: [PATCH] staging: net: core: skbuff.c: Added do-while pair for complex macros

From: Jitendra Kumar Khasdev <[email protected]>
Date: Thu, 26 Nov 2015 22:06:03 +0530

> This patch is to file skbuff.c that fixes up following error,
> reported by checkpatch.pl tool,
>
> 1. ERROR: Macros with multiple statements should be enclosed
> in a do - while loop.
>
> Signed-off-by: Jitendra Kumar Khasdev <[email protected]>

It is absolutely not appropriate to submit this to the -staging tree.