patch-2.4.15 linux/net/ipv4/ip_input.c

Next file: linux/net/ipv4/ipconfig.c
Previous file: linux/net/ipv4/icmp.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.14/linux/net/ipv4/ip_input.c linux/net/ipv4/ip_input.c
@@ -5,7 +5,7 @@
  *
  *		The Internet Protocol (IP) module.
  *
- * Version:	$Id: ip_input.c,v 1.53 2000/12/18 19:01:50 davem Exp $
+ * Version:	$Id: ip_input.c,v 1.54 2001/11/06 22:33:52 davem Exp $
  *
  * Authors:	Ross Biro, <bir7@leland.Stanford.Edu>
  *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
@@ -383,7 +383,7 @@
  */ 
 int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt)
 {
-	struct iphdr *iph = skb->nh.iph;
+	struct iphdr *iph;
 
 	/* When the interface is in promisc. mode, drop all the crap
 	 * that it receives, do not try to analyse it.
@@ -417,6 +417,8 @@
 
 	if (!pskb_may_pull(skb, iph->ihl*4))
 		goto inhdr_error;
+
+	iph = skb->nh.iph;
 
 	if (ip_fast_csum((u8 *)iph, iph->ihl) != 0)
 		goto inhdr_error; 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)