From: Stephen Hemminger <shemminger@osdl.org>
Date: Thu, 8 Sep 2005 19:32:03 +0000 (-0700)
Subject: [NET]: Optimize pskb_trim_rcsum()
X-Git-Tag: v2.6.14-rc1~492^2~22^2~11
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e4e4220f10bf8f58a8606f0cb28538088c64b1a;p=linux-2.6

[NET]: Optimize pskb_trim_rcsum()

Since packets almost never contain extra garbage at the end, it is
worthwhile to optimize for that case.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index da7da9c0ed..2741c0c55e 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -1167,7 +1167,7 @@ static inline void skb_postpull_rcsum(struct sk_buff *skb,
 
 static inline int pskb_trim_rcsum(struct sk_buff *skb, unsigned int len)
 {
-	if (len >= skb->len)
+	if (likely(len >= skb->len))
 		return 0;
 	if (skb->ip_summed == CHECKSUM_HW)
 		skb->ip_summed = CHECKSUM_NONE;