diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-24 08:09:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-24 08:09:26 +0200 |
| commit | 28afe961a18f77b2249062499bdbf70fd2ec6bba (patch) | |
| tree | 71a5cb32924b8c8256bbc0f2f81c6b8c2ac79108 /net/wanrouter | |
| parent | 1e01cb0c6ff7e9ddb6547551794c6aa82785a7cb (diff) | |
| parent | 338b9bb3adac0d2c5a1e180491d9b001d624c402 (diff) | |
| download | op-kernel-dev-28afe961a18f77b2249062499bdbf70fd2ec6bba.zip op-kernel-dev-28afe961a18f77b2249062499bdbf70fd2ec6bba.tar.gz | |
Merge branch 'linus' into tracing/urgent
Diffstat (limited to 'net/wanrouter')
| -rw-r--r-- | net/wanrouter/Kconfig | 2 | ||||
| -rw-r--r-- | net/wanrouter/wanmain.c | 6 | ||||
| -rw-r--r-- | net/wanrouter/wanproc.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/net/wanrouter/Kconfig b/net/wanrouter/Kconfig index 1debe1c..61ceae0 100644 --- a/net/wanrouter/Kconfig +++ b/net/wanrouter/Kconfig @@ -20,8 +20,6 @@ config WAN_ROUTER wish to use your Linux box as a WAN router, say Y here and also to the WAN driver for your card, below. You will then need the wan-tools package which is available from <ftp://ftp.sangoma.com/>. - Read <file:Documentation/networking/wan-router.txt> for more - information. To compile WAN routing support as a module, choose M here: the module will be called wanrouter. diff --git a/net/wanrouter/wanmain.c b/net/wanrouter/wanmain.c index 9ab31a3..b210a88 100644 --- a/net/wanrouter/wanmain.c +++ b/net/wanrouter/wanmain.c @@ -350,9 +350,9 @@ __be16 wanrouter_type_trans(struct sk_buff *skb, struct net_device *dev) * o execute requested action or pass command to the device driver */ -int wanrouter_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, unsigned long arg) +long wanrouter_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { + struct inode *inode = file->f_path.dentry->d_inode; int err = 0; struct proc_dir_entry *dent; struct wan_device *wandev; @@ -372,6 +372,7 @@ int wanrouter_ioctl(struct inode *inode, struct file *file, if (wandev->magic != ROUTER_MAGIC) return -EINVAL; + lock_kernel(); switch (cmd) { case ROUTER_SETUP: err = wanrouter_device_setup(wandev, data); @@ -403,6 +404,7 @@ int wanrouter_ioctl(struct inode *inode, struct file *file, err = wandev->ioctl(wandev, cmd, arg); else err = -EINVAL; } + unlock_kernel(); return err; } diff --git a/net/wanrouter/wanproc.c b/net/wanrouter/wanproc.c index 5bebe40..267f7ff 100644 --- a/net/wanrouter/wanproc.c +++ b/net/wanrouter/wanproc.c @@ -278,7 +278,7 @@ static const struct file_operations wandev_fops = { .read = seq_read, .llseek = seq_lseek, .release = single_release, - .ioctl = wanrouter_ioctl, + .unlocked_ioctl = wanrouter_ioctl, }; /* |
