Commit 0b935d7f authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: gro: move skb_gro_receive_list to udp_offload.c 



This helper is used once, no need to keep it in fat net/core/skbuff.c

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4721031c

include/linux/netdevice.h

+0 −1
Original line number Diff line number Diff line
@@ -2903,7 +2903,6 @@ struct net_device *dev_get_by_napi_id(unsigned int napi_id); 
int netdev_get_name(struct net *net, char *name, int ifindex);

int dev_restart(struct net_device *dev);

int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb);

int skb_gro_receive_list(struct sk_buff *p, struct sk_buff *skb);





static inline int dev_hard_header(struct sk_buff *skb, struct net_device *dev,

net/core/skbuff.c

+0 −26
Original line number Diff line number Diff line
@@ -3920,32 +3920,6 @@ struct sk_buff *skb_segment_list(struct sk_buff *skb, 
}

EXPORT_SYMBOL_GPL(skb_segment_list);



int skb_gro_receive_list(struct sk_buff *p, struct sk_buff *skb)

{

	if (unlikely(p->len + skb->len >= 65536))

		return -E2BIG;



	if (NAPI_GRO_CB(p)->last == p)

		skb_shinfo(p)->frag_list = skb;

	else

		NAPI_GRO_CB(p)->last->next = skb;



	skb_pull(skb, skb_gro_offset(skb));



	NAPI_GRO_CB(p)->last = skb;

	NAPI_GRO_CB(p)->count++;

	p->data_len += skb->len;



	/* sk owenrship - if any - completely transferred to the aggregated packet */

	skb->destructor = NULL;

	p->truesize += skb->truesize;

	p->len += skb->len;



	NAPI_GRO_CB(skb)->same_flow = 1;



	return 0;

}



/**

 *	skb_segment - Perform protocol segmentation on skb.

 *	@head_skb: buffer to segment

net/ipv4/udp_offload.c

+27 −0
Original line number Diff line number Diff line
@@ -425,6 +425,33 @@ static struct sk_buff *udp4_ufo_fragment(struct sk_buff *skb, 
	return segs;

}



static int skb_gro_receive_list(struct sk_buff *p, struct sk_buff *skb)

{

	if (unlikely(p->len + skb->len >= 65536))

		return -E2BIG;



	if (NAPI_GRO_CB(p)->last == p)

		skb_shinfo(p)->frag_list = skb;

	else

		NAPI_GRO_CB(p)->last->next = skb;



	skb_pull(skb, skb_gro_offset(skb));



	NAPI_GRO_CB(p)->last = skb;

	NAPI_GRO_CB(p)->count++;

	p->data_len += skb->len;



	/* sk owenrship - if any - completely transferred to the aggregated packet */

	skb->destructor = NULL;

	p->truesize += skb->truesize;

	p->len += skb->len;



	NAPI_GRO_CB(skb)->same_flow = 1;



	return 0;

}





#define UDP_GRO_CNT_MAX 64

static struct sk_buff *udp_gro_receive_segment(struct list_head *head,

					       struct sk_buff *skb)