diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /net/packet | |
parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'net/packet')
-rw-r--r-- | net/packet/af_packet.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 1e5a509d4..c7e7a6733 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -5,10 +5,7 @@ * * PACKET - implements raw packet sockets. * - * Doesn't belong in IP but it's currently too hooked into ip - * to separate. - * - * Version: @(#)packet.c 1.0.6 05/25/93 + * Version: $Id: af_packet.c,v 1.18 1998/10/03 15:55:24 freitag Exp $ * * Authors: Ross Biro, <bir7@leland.Stanford.Edu> * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG> @@ -1245,7 +1242,7 @@ void cleanup_module(void) int init_module(void) #else -__initfunc(void packet_proto_init(struct net_proto *pro)) +void __init packet_proto_init(struct net_proto *pro) #endif { sock_register(&packet_family_ops); |