36 lines
880 B
Diff
36 lines
880 B
Diff
--- 2.1.26/fs/ncpfs/sock.c Sun Jan 26 11:07:44 1997
|
|
+++ 2.1.26-patched/fs/ncpfs/sock.c Sun Feb 16 17:05:13 1997
|
|
@@ -24,6 +24,7 @@
|
|
#include <linux/ncp.h>
|
|
#include <linux/ncp_fs.h>
|
|
#include <linux/ncp_fs_sb.h>
|
|
+#include <linux/poll.h>
|
|
#include <net/sock.h>
|
|
|
|
|
|
@@ -343,7 +344,6 @@
|
|
char *start = server->packet;
|
|
poll_table wait_table;
|
|
struct poll_table_entry entry;
|
|
- int (*select) (struct inode *, poll_table *);
|
|
int init_timeout, max_timeout;
|
|
int timeout;
|
|
int retrans;
|
|
@@ -362,7 +362,6 @@
|
|
|
|
file = server->ncp_filp;
|
|
inode = file->f_inode;
|
|
- select = file->f_op->poll;
|
|
sock = &inode->u.socket_i;
|
|
if (!sock)
|
|
{
|
|
@@ -418,7 +417,7 @@
|
|
wait_table.nr = 0;
|
|
wait_table.entry = &entry;
|
|
current->state = TASK_INTERRUPTIBLE;
|
|
- if (!select(inode, &wait_table))
|
|
+ if (!(file->f_op->poll(file, &wait_table) & POLLIN))
|
|
{
|
|
if (timeout > max_timeout)
|
|
{
|