| Message ID | 20220217080755.19195-1-gal@nvidia.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8467fadc115cb08bb1cbc7885cb7b7ef1871cae4 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,v2] net: gro: Fix a 'directive in macro's argument list' sparse warning | expand |
On Thu, 2022-02-17 at 10:07 +0200, Gal Pressman wrote: > 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> > --- > Changelog - > v1->v2: https://lore.kernel.org/netdev/20220216103100.9489-1-gal@nvidia.com/ > * Add a comment and fix alignment > --- > include/net/gro.h | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/include/net/gro.h b/include/net/gro.h > index a765fedda5c4..867656b0739c 100644 > --- a/include/net/gro.h > +++ b/include/net/gro.h > @@ -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; LGTM, thanks! Acked-by: Paolo Abeni <pabeni@redhat.com>
Hello: This patch was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: On Thu, 17 Feb 2022 10:07:55 +0200 you wrote: > 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> > > [...] Here is the summary with links: - [net-next,v2] net: gro: Fix a 'directive in macro's argument list' sparse warning https://git.kernel.org/netdev/net-next/c/8467fadc115c You are awesome, thank you!
diff --git a/include/net/gro.h b/include/net/gro.h index a765fedda5c4..867656b0739c 100644 --- a/include/net/gro.h +++ b/include/net/gro.h @@ -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;
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> --- Changelog - v1->v2: https://lore.kernel.org/netdev/20220216103100.9489-1-gal@nvidia.com/ * Add a comment and fix alignment --- include/net/gro.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)