Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb728820 authored by Rami Rosen's avatar Rami Rosen Committed by David S. Miller
Browse files

core: make GRO methods static. 



This patch changes three methods to be static and removes their
EXPORT_SYMBOLs in core/dev.c and their external declaration in
netdevice.h. The methods, dev_gro_receive(), napi_frags_finish() and
napi_skb_finish(), which are in the GRO rx path, are not used
outside core/dev.c.

Signed-off-by: default avatarRami Rosen <ramirose@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7e3a2dc5

include/linux/netdevice.h

+0 −6
Original line number Original line Diff line number Diff line
@@ -2153,16 +2153,10 @@ extern void dev_kfree_skb_any(struct sk_buff *skb); 
extern int		netif_rx(struct sk_buff *skb);

extern int		netif_rx(struct sk_buff *skb);

extern int		netif_rx_ni(struct sk_buff *skb);

extern int		netif_rx_ni(struct sk_buff *skb);

extern int		netif_receive_skb(struct sk_buff *skb);

extern int		netif_receive_skb(struct sk_buff *skb);

extern gro_result_t	dev_gro_receive(struct napi_struct *napi,

					struct sk_buff *skb);

extern gro_result_t	napi_skb_finish(gro_result_t ret, struct sk_buff *skb);

extern gro_result_t	napi_gro_receive(struct napi_struct *napi,

extern gro_result_t	napi_gro_receive(struct napi_struct *napi,

					 struct sk_buff *skb);

					 struct sk_buff *skb);

extern void		napi_gro_flush(struct napi_struct *napi, bool flush_old);

extern void		napi_gro_flush(struct napi_struct *napi, bool flush_old);

extern struct sk_buff *	napi_get_frags(struct napi_struct *napi);

extern struct sk_buff *	napi_get_frags(struct napi_struct *napi);

extern gro_result_t	napi_frags_finish(struct napi_struct *napi,

					  struct sk_buff *skb,

					  gro_result_t ret);

extern gro_result_t	napi_gro_frags(struct napi_struct *napi);

extern gro_result_t	napi_gro_frags(struct napi_struct *napi);





static inline void napi_free_frags(struct napi_struct *napi)

static inline void napi_free_frags(struct napi_struct *napi)

net/core/dev.c

+3 −6
Original line number Original line Diff line number Diff line
@@ -3592,7 +3592,7 @@ void napi_gro_flush(struct napi_struct *napi, bool flush_old) 
}

}

EXPORT_SYMBOL(napi_gro_flush);

EXPORT_SYMBOL(napi_gro_flush);





enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff *skb)

static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff *skb)

{

{

	struct sk_buff **pp = NULL;

	struct sk_buff **pp = NULL;

	struct packet_offload *ptype;

	struct packet_offload *ptype;
@@ -3683,7 +3683,6 @@ enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff *skb) 
	ret = GRO_NORMAL;

	ret = GRO_NORMAL;

	goto pull;

	goto pull;

}

}

EXPORT_SYMBOL(dev_gro_receive);





static inline gro_result_t

static inline gro_result_t

__napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb)

__napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
@@ -3710,7 +3709,7 @@ __napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb) 
	return dev_gro_receive(napi, skb);

	return dev_gro_receive(napi, skb);

}

}





gro_result_t napi_skb_finish(gro_result_t ret, struct sk_buff *skb)

static gro_result_t napi_skb_finish(gro_result_t ret, struct sk_buff *skb)

{

{

	switch (ret) {

	switch (ret) {

	case GRO_NORMAL:

	case GRO_NORMAL:
@@ -3736,7 +3735,6 @@ gro_result_t napi_skb_finish(gro_result_t ret, struct sk_buff *skb) 




	return ret;

	return ret;

}

}

EXPORT_SYMBOL(napi_skb_finish);





static void skb_gro_reset_offset(struct sk_buff *skb)

static void skb_gro_reset_offset(struct sk_buff *skb)

{

{
@@ -3788,7 +3786,7 @@ struct sk_buff *napi_get_frags(struct napi_struct *napi) 
}

}

EXPORT_SYMBOL(napi_get_frags);

EXPORT_SYMBOL(napi_get_frags);





gro_result_t napi_frags_finish(struct napi_struct *napi, struct sk_buff *skb,

static gro_result_t napi_frags_finish(struct napi_struct *napi, struct sk_buff *skb,

			       gro_result_t ret)

			       gro_result_t ret)

{

{

	switch (ret) {

	switch (ret) {
@@ -3813,7 +3811,6 @@ gro_result_t napi_frags_finish(struct napi_struct *napi, struct sk_buff *skb, 




	return ret;

	return ret;

}

}

EXPORT_SYMBOL(napi_frags_finish);





static struct sk_buff *napi_frags_skb(struct napi_struct *napi)

static struct sk_buff *napi_frags_skb(struct napi_struct *napi)

{

{