diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2009-03-11 14:50:58 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2009-03-11 14:50:58 +0000 |
| commit | 4e85754fc515682783bdaf38b5ac0347b37e5052 (patch) | |
| tree | af5e4d4abe42a201ae90033bdbe509defb5f8d66 /drivers/dahdi/dahdi-base.c | |
| parent | 0f1c9a8ca73fae4f5b29d980cec152e8269bb5a6 (diff) | |
Fix direction bits on several ioctls.
(related to issue #14499)
Reported by: ys
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@6124 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/dahdi-base.c')
| -rw-r--r-- | drivers/dahdi/dahdi-base.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 2691cab..7749c68 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -3435,6 +3435,7 @@ static int dahdi_common_ioctl(struct inode *node, struct file *file, unsigned in switch(cmd) { /* get channel parameters */ + case DAHDI_GET_PARAMS_V1: /* Intentional drop through. */ case DAHDI_GET_PARAMS: size_to_copy = sizeof(struct dahdi_params); if (copy_from_user(&stack.param, (struct dahdi_params *) data, size_to_copy)) @@ -3665,6 +3666,7 @@ static int dahdi_common_ioctl(struct inode *node, struct file *file, unsigned in if (copy_to_user((struct dahdi_spaninfo *) data, &stack.spaninfo, size_to_copy)) return -EFAULT; break; + case DAHDI_CHANDIAG_V1: /* Intentional drop through. */ case DAHDI_CHANDIAG: get_user(j, (int *)data); /* get channel number from user */ /* make sure its a valid channel number */ @@ -4531,6 +4533,7 @@ static int dahdi_chanandpseudo_ioctl(struct inode *inode, struct file *file, uns rv = start_tone(chan, j); spin_unlock_irqrestore(&chan->lock, flags); return rv; + case DAHDI_GETCONF_V1: /* intentional drop through */ case DAHDI_GETCONF: /* get conf stuff */ if (copy_from_user(&stack.conf,(struct dahdi_confinfo *) data,sizeof(stack.conf))) return -EFAULT; @@ -4546,6 +4549,7 @@ static int dahdi_chanandpseudo_ioctl(struct inode *inode, struct file *file, uns if (copy_to_user((struct dahdi_confinfo *) data,&stack.conf,sizeof(stack.conf))) return -EFAULT; break; + case DAHDI_SETCONF_V1: /* Intentional fall through. */ case DAHDI_SETCONF: /* set conf stuff */ if (copy_from_user(&stack.conf,(struct dahdi_confinfo *) data,sizeof(stack.conf))) return -EFAULT; @@ -4708,6 +4712,7 @@ static int dahdi_chanandpseudo_ioctl(struct inode *inode, struct file *file, uns spin_unlock(&chan->lock); spin_unlock_irqrestore(&bigzaplock, flags); return(rv); + case DAHDI_CONFDIAG_V1: /* Intention fall-through */ case DAHDI_CONFDIAG: /* output diagnostic info to console */ if (!(chan->flags & DAHDI_FLAG_AUDIO)) return (-EINVAL); get_user(j,(int *)data); /* get conf # */ |