| Message ID | 20240308102230.296224-1-edumazet@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e5b7aefe38f7f6258935d8a10c36552dd957048a |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: gro: move two declarations to include/net/gro.h | expand |
On Fri, Mar 08, 2024 at 10:22:30AM +0000, Eric Dumazet wrote: > Move gro_find_receive_by_type() and gro_find_complete_by_type() > to include/net/gro.h where they belong. > > Also use _NET_GRO_H instead of _NET_IPV6_GRO_H to protect > include/net/gro.h from multiple inclusions. > > Signed-off-by: Eric Dumazet <edumazet@google.com> Reviewed-by: Simon Horman <horms@kernel.org>
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Fri, 8 Mar 2024 10:22:30 +0000 you wrote: > Move gro_find_receive_by_type() and gro_find_complete_by_type() > to include/net/gro.h where they belong. > > Also use _NET_GRO_H instead of _NET_IPV6_GRO_H to protect > include/net/gro.h from multiple inclusions. > > Signed-off-by: Eric Dumazet <edumazet@google.com> > > [...] Here is the summary with links: - [net-next] net: gro: move two declarations to include/net/gro.h https://git.kernel.org/netdev/net-next/c/e5b7aefe38f7 You are awesome, thank you!
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 4230c7f3b95961f18dfaca03ef396c886feefbf2..c6f6ac779b34ef1a8f98853c84a7a2e0192e0e8f 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -3901,8 +3901,6 @@ void napi_gro_flush(struct napi_struct *napi, bool flush_old); struct sk_buff *napi_get_frags(struct napi_struct *napi); void napi_get_frags_check(struct napi_struct *napi); gro_result_t napi_gro_frags(struct napi_struct *napi); -struct packet_offload *gro_find_receive_by_type(__be16 type); -struct packet_offload *gro_find_complete_by_type(__be16 type); static inline void napi_free_frags(struct napi_struct *napi) { diff --git a/include/net/gro.h b/include/net/gro.h index d6fc8fbd37302338fc09ab01fead899002c5833f..50f1e403dbbb3805277d74ff80b504677e9a7aa0 100644 --- a/include/net/gro.h +++ b/include/net/gro.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef _NET_IPV6_GRO_H -#define _NET_IPV6_GRO_H +#ifndef _NET_GRO_H +#define _NET_GRO_H #include <linux/indirect_call_wrapper.h> #include <linux/ip.h> @@ -494,4 +494,7 @@ static inline void inet6_get_iif_sdif(const struct sk_buff *skb, int *iif, int * #endif } -#endif /* _NET_IPV6_GRO_H */ +struct packet_offload *gro_find_receive_by_type(__be16 type); +struct packet_offload *gro_find_complete_by_type(__be16 type); + +#endif /* _NET_GRO_H */
Move gro_find_receive_by_type() and gro_find_complete_by_type() to include/net/gro.h where they belong. Also use _NET_GRO_H instead of _NET_IPV6_GRO_H to protect include/net/gro.h from multiple inclusions. Signed-off-by: Eric Dumazet <edumazet@google.com> --- include/linux/netdevice.h | 2 -- include/net/gro.h | 9 ++++++--- 2 files changed, 6 insertions(+), 5 deletions(-)