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

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

diff -u --recursive --new-file v2.3.48/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.45 2000/01/16 05:11:22 davem Exp $
+ * Version:	$Id: ip_input.c,v 1.46 2000/02/22 23:54:26 davem Exp $
  *
  * Authors:	Ross Biro, <bir7@leland.Stanford.Edu>
  *		Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
@@ -241,7 +241,6 @@
 		if(raw_sk != NULL)
 			raw_sk = raw_v4_input(skb, iph, hash);
 
-		read_lock(&inet_protocol_lock);
 		ipprot = (struct inet_protocol *) inet_protos[hash];
 		flag = 0;
 		if(ipprot != NULL) {
@@ -254,13 +253,11 @@
 				ret = ipprot->handler(skb, (ntohs(iph->tot_len) -
 							    (iph->ihl * 4)));
 
-				read_unlock(&inet_protocol_lock);
 				return ret;
 			} else {
 				flag = ip_run_ipprot(skb, iph, ipprot, (raw_sk != NULL));
 			}
 		}
-		read_unlock(&inet_protocol_lock);
 
 		/* All protocols checked.
 		 * If this packet was a broadcast, we may *not* reply to it, since that

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