diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2008-05-22 18:55:12 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2008-05-22 18:55:12 +0000 |
| commit | 6afc4125b460efa9ce5ec7e0af532cfc4b613817 (patch) | |
| tree | bc2c9cfb7fb262787d884b9c8fdc8cae2b603174 /drivers/dahdi | |
| parent | 75236d3a413d1aadaff15d92237e74af7a306b01 (diff) | |
remove compatibility mode ioctls, since they are not needed here
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4330 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi')
| -rw-r--r-- | drivers/dahdi/dahdi-base.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index bfa5a8d..6bb7b93 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -3086,10 +3086,8 @@ static int dahdi_common_ioctl(struct inode *node, struct file *file, unsigned in switch(cmd) { /* get channel parameters */ - case DAHDI_GET_PARAMS_V1: case DAHDI_GET_PARAMS: - size_to_copy = (cmd == DAHDI_GET_PARAMS_V1) ? sizeof(struct dahdi_params_v1) : - sizeof(struct dahdi_params); + size_to_copy = sizeof(struct dahdi_params); if (copy_from_user(&stack.param, (struct dahdi_params *) data, size_to_copy)) return -EFAULT; @@ -3173,13 +3171,8 @@ static int dahdi_common_ioctl(struct inode *node, struct file *file, unsigned in break; /* set channel parameters */ - case DAHDI_SET_PARAMS_V1: case DAHDI_SET_PARAMS: - /* The difference between dahdi_params and dahdi_params_v1 is just the - * last field, which is read-only anyway. Thus we just read the - * size of the older struct. - */ - if (copy_from_user(&stack.param, (struct dahdi_params *) data, sizeof(struct dahdi_params_v1))) + if (copy_from_user(&stack.param, (struct dahdi_params *) data, sizeof(struct dahdi_params))) return -EFAULT; stack.param.chan_alarms = 0; /* be explicit about the above */ @@ -3273,12 +3266,8 @@ static int dahdi_common_ioctl(struct inode *node, struct file *file, unsigned in if (copy_to_user((struct dahdi_gains *) data,&stack.gain,sizeof(stack.gain))) return -EFAULT; break; - case DAHDI_SPANSTAT_V1: - case DAHDI_SPANSTAT_V2: case DAHDI_SPANSTAT: - size_to_copy = (cmd == DAHDI_SPANSTAT_V1) ? sizeof(struct dahdi_spaninfo_v1) : - (cmd == DAHDI_SPANSTAT_V2) ? sizeof(struct dahdi_spaninfo_v2) : - sizeof(struct dahdi_spaninfo); + size_to_copy = sizeof(struct dahdi_spaninfo); if (copy_from_user(&stack.spaninfo, (struct dahdi_spaninfo *) data, size_to_copy)) return -EFAULT; i = stack.spaninfo.spanno; /* get specified span number */ @@ -3311,10 +3300,8 @@ static int dahdi_common_ioctl(struct inode *node, struct file *file, unsigned in if (spans[i]->chans[j].sig) stack.spaninfo.numchans++; } - /* version 2 fields */ stack.spaninfo.lbo = spans[i]->lbo; stack.spaninfo.lineconfig = spans[i]->lineconfig; - /* version 3 fields */ stack.spaninfo.irq = spans[i]->irq; stack.spaninfo.linecompat = spans[i]->linecompat; dahdi_copy_string(stack.spaninfo.lboname, dahdi_lboname(spans[i]->lbo), sizeof(stack.spaninfo.lboname)); |