From fc6783055d0326183feb4ab276846ba14e825144 Mon Sep 17 00:00:00 2001 From: Hua Zhong Date: Sat, 6 May 2006 18:11:39 -0700 Subject: [PATCH] --- yaml --- r: 26551 b: refs/heads/master c: 0182bd2b1e2fb45a55f110795bfdb9aa5f6c6b0b h: refs/heads/master i: 26549: 3e3eaf31688de5c392dc949d137f863edd8b5fa0 26547: ef19b6611c0415ae22c669c640c14b7d801f4052 26543: ffcd929936131649263a6efdf742735b9992c348 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 332d33fd9f83..fb0e08e7ce84 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe9925b551a95fae6ec61470c79f8b701a2fe928 +refs/heads/master: 0182bd2b1e2fb45a55f110795bfdb9aa5f6c6b0b diff --git a/trunk/net/ipv4/ip_input.c b/trunk/net/ipv4/ip_input.c index 18d7fad474d7..c9026dbf4c93 100644 --- a/trunk/net/ipv4/ip_input.c +++ b/trunk/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)) {