From a9d1c3a9ab3a7ca2ac2bf2526276c764135728b4 Mon Sep 17 00:00:00 2001
From: Thomas Graf <tgraf@suug.ch>
Date: Sat, 20 Aug 2005 17:25:52 -0700
Subject: [PATCH] --- yaml --- r: 6390 b: refs/heads/master c:
 e9c604227391308b185aa6b14c7f93b0a0c2e51b h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv4/ip_input.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bfed7f1741d0..a3b97d802ff8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58615242417638794a5ba299c49e3fbd6f47c2a3
+refs/heads/master: e9c604227391308b185aa6b14c7f93b0a0c2e51b
diff --git a/trunk/net/ipv4/ip_input.c b/trunk/net/ipv4/ip_input.c
index 322b082ede1e..6a06e15694dc 100644
--- a/trunk/net/ipv4/ip_input.c
+++ b/trunk/net/ipv4/ip_input.c
@@ -400,7 +400,7 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt,
 
 	iph = skb->nh.iph;
 
-	if (ip_fast_csum((u8 *)iph, iph->ihl) != 0)
+	if (unlikely(ip_fast_csum((u8 *)iph, iph->ihl)))
 		goto inhdr_error;
 
 	len = ntohs(iph->tot_len);