OSDN Git Service

net: gro: Fix a 'directive in macro's argument list' sparse warning
authorGal Pressman <gal@nvidia.com>
Thu, 17 Feb 2022 08:07:55 +0000 (10:07 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 18 Feb 2022 11:00:25 +0000 (11:00 +0000)
Following the cited commit, sparse started complaining about:
../include/net/gro.h:58:1: warning: directive in macro's argument list
../include/net/gro.h:59:1: warning: directive in macro's argument list

Fix that by moving the defines out of the struct_group() macro.

Fixes: de5a1f3ce4c8 ("net: gro: minor optimization for dev_gro_receive()")
Reviewed-by: Maxim Mikityanskiy <maximmi@nvidia.com>
Signed-off-by: Gal Pressman <gal@nvidia.com>
Acked-by: Alexander Lobakin <alexandr.lobakin@intel.com>
Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/gro.h

index a765fed..867656b 100644 (file)
@@ -35,6 +35,9 @@ struct napi_gro_cb {
        /* jiffies when first packet was created/queued */
        unsigned long age;
 
+/* Used in napi_gro_cb::free */
+#define NAPI_GRO_FREE             1
+#define NAPI_GRO_FREE_STOLEN_HEAD 2
        /* portion of the cb set to zero at every gro iteration */
        struct_group(zeroed,
 
@@ -55,8 +58,6 @@ struct napi_gro_cb {
 
                /* Free the skb? */
                u8      free:2;
-#define NAPI_GRO_FREE            1
-#define NAPI_GRO_FREE_STOLEN_HEAD 2
 
                /* Used in foo-over-udp, set in udp[46]_gro_receive */
                u8      is_ipv6:1;