aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHua Zhong <hzhong@gmail.com>2006-05-06 18:11:39 -0700
committerDavid S. Miller <davem@davemloft.net>2006-05-06 18:11:39 -0700
commit0182bd2b1e2fb45a55f110795bfdb9aa5f6c6b0b (patch)
tree0dc080da5d8cd3bdcdee609f08ca73d8df23a544
parentfe9925b551a95fae6ec61470c79f8b701a2fe928 (diff)
[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>
-rw-r--r--net/ipv4/ip_input.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
index 18d7fad474d..c9026dbf4c9 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)) {