diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 00:24:27 +0000 |
| commit | b9558d5f86c471a125abf1fb3a3882fb053b1f8c (patch) | |
| tree | 707b53ec64e740a7da87d5f36485e3cd9b1c794e /net/packet | |
| parent | b3ac367c7a3e6047abe74817db27e34e759f279f (diff) | |
Merge with Linux 2.3.41.
Diffstat (limited to 'net/packet')
| -rw-r--r-- | net/packet/af_packet.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index eec4d92d7..e73adb8e2 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.26 1999/12/20 05:20:02 davem Exp $ + * Version: $Id: af_packet.c,v 1.28 2000/01/24 23:35:59 davem Exp $ * * Authors: Ross Biro, <bir7@leland.Stanford.Edu> * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG> @@ -789,13 +789,8 @@ static int packet_release(struct socket *sock) * Now the socket is dead. No more input will appear. */ - write_lock_irq(&sk->callback_lock); + sock_orphan(sk); sock->sk = NULL; - sk->socket = NULL; - sk->dead = 1; - sk->sleep = NULL; - write_unlock_irq(&sk->callback_lock); - /* Purge queues */ @@ -1537,15 +1532,8 @@ static void packet_mm_close(struct vm_area_struct *vma) } static struct vm_operations_struct packet_mmap_ops = { - packet_mm_open, /* open */ - packet_mm_close, /* close */ - NULL, /* unmap */ - NULL, /* no special protect */ - NULL, /* sync */ - NULL, /* advise */ - NULL, /* nopage */ - NULL, /* wppage */ - NULL /* swapout */ + open: packet_mm_open, + close: packet_mm_close, }; static void free_pg_vec(unsigned long *pg_vec, unsigned order, unsigned len) |