From: Hua Zhong <hzhong@gmail.com>
Date: Sun, 7 May 2006 01:11:39 +0000 (-0700)
Subject: [IPV4]: Remove likely in ip_rcv_finish()
X-Git-Tag: v2.6.17-rc4~22^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0182bd2b1e2fb45a55f110795bfdb9aa5f6c6b0b;p=linux-2.6

[IPV4]: Remove likely in ip_rcv_finish()

This is another result from my likely profiling tool
(dwalker@mvista.com just sent the patch of the profiling tool to
linux-kernel mailing list, which is similar to what I use).

On my system (not very busy, normal development machine within a
VMWare workstation), I see a 6/5 miss/hit ratio for this "likely".

Signed-off-by: Hua Zhong <hzhong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
index 18d7fad474..c9026dbf4c 100644
--- a/net/ipv4/ip_input.c
+++ b/net/ipv4/ip_input.c
@@ -337,7 +337,7 @@ static inline int ip_rcv_finish(struct sk_buff *skb)
 	 *	Initialise the virtual path cache for the packet. It describes
 	 *	how the packet travels inside Linux networking.
 	 */ 
-	if (likely(skb->dst == NULL)) {
+	if (skb->dst == NULL) {
 		int err = ip_route_input(skb, iph->daddr, iph->saddr, iph->tos,
 					 skb->dev);
 		if (unlikely(err)) {