diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
| commit | 9f9f3e6e8548a596697778337110a423c384b6f3 (patch) | |
| tree | 5dd4b290ef532cf5ecb058e1a92cd3435afeac8c /net/ipv4/ip_input.c | |
| parent | d5c9a365ee7d2fded249aa5abfc5e89587583029 (diff) | |
Merge with Linux 2.3.49.
Diffstat (limited to 'net/ipv4/ip_input.c')
| -rw-r--r-- | net/ipv4/ip_input.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c index 23389d249..0c755dbcd 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.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 @@ static inline int ip_local_deliver_finish(struct sk_buff *skb) 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 @@ static inline int ip_local_deliver_finish(struct sk_buff *skb) 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 |