diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
commit | 06615f62b17d7de6e12d2f5ec6b88cf30af08413 (patch) | |
tree | 8766f208847d4876a6db619aebbf54d53b76eb44 /net/ipv4/ip_input.c | |
parent | fa9bdb574f4febb751848a685d9a9017e04e1d53 (diff) |
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'net/ipv4/ip_input.c')
-rw-r--r-- | net/ipv4/ip_input.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c index bb76f7ce5..873030d0a 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.49 2000/08/21 20:41:55 davem Exp $ + * Version: $Id: ip_input.c,v 1.50 2000/10/24 22:54:26 davem Exp $ * * Authors: Ross Biro, <bir7@leland.Stanford.Edu> * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG> @@ -341,7 +341,7 @@ static inline int ip_rcv_finish(struct sk_buff *skb) skb = skb_cow(skb, skb_headroom(skb)); if (skb == NULL) - return 0; + return NET_RX_DROP; iph = skb->nh.iph; skb->ip_summed = 0; @@ -372,7 +372,7 @@ inhdr_error: IP_INC_STATS_BH(IpInHdrErrors); drop: kfree_skb(skb); - return(0); + return NET_RX_DROP; } /* @@ -429,6 +429,6 @@ inhdr_error: drop: kfree_skb(skb); out: - return(0); + return NET_RX_DROP; } |