Commit e5b7aefe authored by Eric Dumazet's avatar Eric Dumazet Committed by Jakub Kicinski
Browse files

net: gro: move two declarations to include/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: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/20240308102230.296224-1-edumazet@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2b395358

include/linux/netdevice.h

+0 −2
Original line number Diff line number Diff line
@@ -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)

{

include/net/gro.h

+6 −3
Original line number Diff line number Diff line 
/* 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 */