Skip to content

Commit e5b7aef

Browse files
edumazetkuba-moo
authored andcommitted
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: Eric Dumazet <[email protected]> Reviewed-by: Simon Horman <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 2b39535 commit e5b7aef

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

include/linux/netdevice.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3901,8 +3901,6 @@ void napi_gro_flush(struct napi_struct *napi, bool flush_old);
39013901
struct sk_buff *napi_get_frags(struct napi_struct *napi);
39023902
void napi_get_frags_check(struct napi_struct *napi);
39033903
gro_result_t napi_gro_frags(struct napi_struct *napi);
3904-
struct packet_offload *gro_find_receive_by_type(__be16 type);
3905-
struct packet_offload *gro_find_complete_by_type(__be16 type);
39063904

39073905
static inline void napi_free_frags(struct napi_struct *napi)
39083906
{

include/net/gro.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* SPDX-License-Identifier: GPL-2.0-or-later */
22

3-
#ifndef _NET_IPV6_GRO_H
4-
#define _NET_IPV6_GRO_H
3+
#ifndef _NET_GRO_H
4+
#define _NET_GRO_H
55

66
#include <linux/indirect_call_wrapper.h>
77
#include <linux/ip.h>
@@ -494,4 +494,7 @@ static inline void inet6_get_iif_sdif(const struct sk_buff *skb, int *iif, int *
494494
#endif
495495
}
496496

497-
#endif /* _NET_IPV6_GRO_H */
497+
struct packet_offload *gro_find_receive_by_type(__be16 type);
498+
struct packet_offload *gro_find_complete_by_type(__be16 type);
499+
500+
#endif /* _NET_GRO_H */

0 commit comments

Comments
 (0)