diff options
| author | Alan Cox <alan@redhat.com> | 2008-05-25 23:43:11 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-25 23:43:11 -0700 |
| commit | 54064600981ab0fe977b0e760732c30f4472d693 (patch) | |
| tree | a58d0325e593a148dc80eae84eef7ff1ad2523a8 /net/irda/irnet/irnet_ppp.h | |
| parent | 866988edacebb6f1982266b51fc344c969f481ec (diff) | |
irda: Push BKL down into irda ioctl handlers
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/irda/irnet/irnet_ppp.h')
| -rw-r--r-- | net/irda/irnet/irnet_ppp.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/irda/irnet/irnet_ppp.h b/net/irda/irnet/irnet_ppp.h index d2beb7df8f7..d9f8bd4ebd0 100644 --- a/net/irda/irnet/irnet_ppp.h +++ b/net/irda/irnet/irnet_ppp.h @@ -76,9 +76,8 @@ static ssize_t static unsigned int dev_irnet_poll(struct file *, poll_table *); -static int - dev_irnet_ioctl(struct inode *, - struct file *, +static long + dev_irnet_ioctl(struct file *, unsigned int, unsigned long); /* ------------------------ PPP INTERFACE ------------------------ */ @@ -102,7 +101,7 @@ static struct file_operations irnet_device_fops = .read = dev_irnet_read, .write = dev_irnet_write, .poll = dev_irnet_poll, - .ioctl = dev_irnet_ioctl, + .unlocked_ioctl = dev_irnet_ioctl, .open = dev_irnet_open, .release = dev_irnet_close /* Also : llseek, readdir, mmap, flush, fsync, fasync, lock, readv, writev */ |