diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
| commit | b9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 (patch) | |
| tree | 42d07b0c7246ae2536a702e7c5de9e2732341116 /net/packet | |
| parent | 7406b0a326f2d70ade2671c37d1beef62249db97 (diff) | |
Merge with 2.3.99-pre6.
Diffstat (limited to 'net/packet')
| -rw-r--r-- | net/packet/af_packet.c | 72 |
1 files changed, 35 insertions, 37 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 799ec9476..2955a04f6 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -5,7 +5,7 @@ * * PACKET - implements raw packet sockets. * - * Version: $Id: af_packet.c,v 1.33 2000/03/13 22:11:50 davem Exp $ + * Version: $Id: af_packet.c,v 1.34 2000/04/25 04:13:35 davem Exp $ * * Authors: Ross Biro, <bir7@leland.Stanford.Edu> * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG> @@ -1723,46 +1723,44 @@ out: #ifdef CONFIG_SOCK_PACKET struct proto_ops packet_ops_spkt = { - PF_PACKET, - - packet_release, - packet_bind_spkt, - sock_no_connect, - sock_no_socketpair, - sock_no_accept, - packet_getname_spkt, - datagram_poll, - packet_ioctl, - sock_no_listen, - sock_no_shutdown, - sock_no_setsockopt, - sock_no_getsockopt, - sock_no_fcntl, - packet_sendmsg_spkt, - packet_recvmsg, - sock_no_mmap + family: PF_PACKET, + + release: packet_release, + bind: packet_bind_spkt, + connect: sock_no_connect, + socketpair: sock_no_socketpair, + accept: sock_no_accept, + getname: packet_getname_spkt, + poll: datagram_poll, + ioctl: packet_ioctl, + listen: sock_no_listen, + shutdown: sock_no_shutdown, + setsockopt: sock_no_setsockopt, + getsockopt: sock_no_getsockopt, + sendmsg: packet_sendmsg_spkt, + recvmsg: packet_recvmsg, + mmap: sock_no_mmap, }; #endif struct proto_ops packet_ops = { - PF_PACKET, - - packet_release, - packet_bind, - sock_no_connect, - sock_no_socketpair, - sock_no_accept, - packet_getname, - packet_poll, - packet_ioctl, - sock_no_listen, - sock_no_shutdown, - packet_setsockopt, - packet_getsockopt, - sock_no_fcntl, - packet_sendmsg, - packet_recvmsg, - packet_mmap, + family: PF_PACKET, + + release: packet_release, + bind: packet_bind, + connect: sock_no_connect, + socketpair: sock_no_socketpair, + accept: sock_no_accept, + getname: packet_getname, + poll: packet_poll, + ioctl: packet_ioctl, + listen: sock_no_listen, + shutdown: sock_no_shutdown, + setsockopt: packet_setsockopt, + getsockopt: packet_getsockopt, + sendmsg: packet_sendmsg, + recvmsg: packet_recvmsg, + mmap: packet_mmap, }; static struct net_proto_family packet_family_ops = { |