Commit 5e646143 authored by popcornmix's avatar popcornmix
Browse files

Revert "Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends"" 

This reverts commit 4a098c78.
parent 723af8f6

include/linux/skbuff.h

+2 −3
Original line number Diff line number Diff line
@@ -3139,6 +3139,7 @@ static inline void *skb_push_rcsum(struct sk_buff *skb, unsigned int len) 
	return skb->data;

}



int pskb_trim_rcsum_slow(struct sk_buff *skb, unsigned int len);

/**

 *	pskb_trim_rcsum - trim received skb and update checksum

 *	@skb: buffer to trim
@@ -3152,9 +3153,7 @@ static inline int pskb_trim_rcsum(struct sk_buff *skb, unsigned int len) 
{

	if (likely(len >= skb->len))

		return 0;

	if (skb->ip_summed == CHECKSUM_COMPLETE)

		skb->ip_summed = CHECKSUM_NONE;

	return __pskb_trim(skb, len);

	return pskb_trim_rcsum_slow(skb, len);

}



static inline int __skb_trim_rcsum(struct sk_buff *skb, unsigned int len)

net/core/skbuff.c

+14 −0
Original line number Diff line number Diff line
@@ -1836,6 +1836,20 @@ done: 
}

EXPORT_SYMBOL(___pskb_trim);



/* Note : use pskb_trim_rcsum() instead of calling this directly

 */

int pskb_trim_rcsum_slow(struct sk_buff *skb, unsigned int len)

{

	if (skb->ip_summed == CHECKSUM_COMPLETE) {

		int delta = skb->len - len;



		skb->csum = csum_sub(skb->csum,

				     skb_checksum(skb, len, delta, 0));

	}

	return __pskb_trim(skb, len);

}

EXPORT_SYMBOL(pskb_trim_rcsum_slow);



/**

 *	__pskb_pull_tail - advance tail of skb header

 *	@skb: buffer to reallocate