From 1a1d77dd589de5a567fa95e36aa6999c704ceca4 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 28 Aug 2000 22:00:09 +0000
Subject: Merge with 2.4.0-test7.

---
 net/ipv4/ip_input.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'net/ipv4/ip_input.c')

diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
index 700bb24f7..bb76f7ce5 100644
--- a/net/ipv4/ip_input.c
+++ b/net/ipv4/ip_input.c
@@ -5,7 +5,7 @@
  *
  *		The Internet Protocol (IP) module.
  *
- * Version:	$Id: ip_input.c,v 1.48 2000/04/15 01:48:10 davem Exp $
+ * Version:	$Id: ip_input.c,v 1.49 2000/08/21 20:41:55 davem Exp $
  *
  * Authors:	Ross Biro, <bir7@leland.Stanford.Edu>
  *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
@@ -297,7 +297,6 @@ int ip_local_deliver(struct sk_buff *skb)
 		skb = ip_defrag(skb);
 		if (!skb)
 			return 0;
-		iph = skb->nh.iph;
 	}
 
 	return NF_HOOK(PF_INET, NF_IP_LOCAL_IN, skb, skb->dev, NULL,
-- 
cgit v1.2.3