mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[TTY]: Use tty_mode_ioctl() in network drivers. 

We conciously make a change here - we permit mode and speed setting to
be done in things like SLIP mode. There isn't actually a technical
reason to disallow this. It's usually a silly thing to do but we can
do it and soemone might wish to do so.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alan Cox 2007-11-07 01:27:34 -08:00 committed by David S. Miller
parent 0fc00e2440
commit d0127539ea
7 changed files with 20 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/net/hamradio/6pack.c
View File

@ -762,26 +762,20 @@ static int sixpack_ioctl(struct tty_struct *tty, struct file *file,
if (copy_from_user(&addr,
(void __user *) arg, AX25_ADDR_LEN)) {
err = -EFAULT;
err = -EFAULT;
break;
}
netif_tx_lock_bh(dev);
memcpy(dev->dev_addr, &addr, AX25_ADDR_LEN);
netif_tx_unlock_bh(dev);
err = 0;
break;
}
netif_tx_lock_bh(dev);
memcpy(dev->dev_addr, &addr, AX25_ADDR_LEN);
netif_tx_unlock_bh(dev);
err = 0;
break;
}
/* Allow stty to read, but not set, the serial port */
case TCGETS:
case TCGETA:
err = n_tty_ioctl(tty, (struct file *) file, cmd, arg);
break;
default:
err = -ENOIOCTLCMD;
err = tty_mode_ioctl(tty, file, cmd, arg);
}
sp_put(sp);

7
drivers/net/irda/irtty-sir.c
View File

@ -434,11 +434,6 @@ static int irtty_ioctl(struct tty_struct *tty, struct file *file, unsigned int c
IRDA_ASSERT(dev != NULL, return -1;);
switch (cmd) {
case TCGETS:
case TCGETA:
err = n_tty_ioctl(tty, file, cmd, arg);
break;
case IRTTY_IOCTDONGLE:
/* this call blocks for completion */
err = sirdev_set_dongle(dev, (IRDA_DONGLE) arg);
@ -454,7 +449,7 @@ static int irtty_ioctl(struct tty_struct *tty, struct file *file, unsigned int c
err = -EFAULT;
break;
default:
err = -ENOIOCTLCMD;
err = tty_mode_ioctl(tty, file, cmd, arg);
break;
}
return err;

10
drivers/net/ppp_async.c
View File

@ -309,16 +309,11 @@ ppp_asynctty_ioctl(struct tty_struct *tty, struct file *file,
err = 0;
break;
case TCGETS:
case TCGETA:
err = n_tty_ioctl(tty, file, cmd, arg);
break;
case TCFLSH:
/* flush our buffers and the serial port's buffer */
if (arg == TCIOFLUSH || arg == TCOFLUSH)
ppp_async_flush_output(ap);
err = n_tty_ioctl(tty, file, cmd, arg);
err = tty_perform_flush(tty, arg);
break;
case FIONREAD:
@ -329,7 +324,8 @@ ppp_asynctty_ioctl(struct tty_struct *tty, struct file *file,
break;
default:
err = -ENOIOCTLCMD;
/* Try the various mode ioctls */
err = tty_mode_ioctl(tty, file, cmd, arg);
}
ap_put(ap);

10
drivers/net/ppp_synctty.c
View File

@ -349,16 +349,11 @@ ppp_synctty_ioctl(struct tty_struct *tty, struct file *file,
err = 0;
break;
case TCGETS:
case TCGETA:
err = n_tty_ioctl(tty, file, cmd, arg);
break;
case TCFLSH:
/* flush our buffers and the serial port's buffer */
if (arg == TCIOFLUSH || arg == TCOFLUSH)
ppp_sync_flush_output(ap);
err = n_tty_ioctl(tty, file, cmd, arg);
err = tty_perform_flush(tty, arg);
break;
case FIONREAD:
@ -369,7 +364,8 @@ ppp_synctty_ioctl(struct tty_struct *tty, struct file *file,
break;
default:
err = -ENOIOCTLCMD;
err = tty_mode_ioctl(tty, file, cmd, arg);
break;
}
sp_put(ap);

8
drivers/net/slip.c
View File

@ -1218,14 +1218,8 @@ static int slip_ioctl(struct tty_struct *tty, struct file *file, unsigned int cm
return 0;
/* VSV changes end */
#endif
/* Allow stty to read, but not set, the serial port */
case TCGETS:
case TCGETA:
return n_tty_ioctl(tty, file, cmd, arg);
default:
return -ENOIOCTLCMD;
return tty_mode_ioctl(tty, file, cmd, arg);
}
}

6
drivers/net/wan/x25_asy.c
View File

@ -719,12 +719,8 @@ static int x25_asy_ioctl(struct tty_struct *tty, struct file *file,
return 0;
case SIOCSIFHWADDR:
return -EINVAL;
/* Allow stty to read, but not set, the serial port */
case TCGETS:
case TCGETA:
return n_tty_ioctl(tty, file, cmd, arg);
default:
return -ENOIOCTLCMD;
return tty_mode_ioctl(tty, file, cmd, arg);
}
}

10
drivers/net/wireless/strip.c
View File

@ -2735,16 +2735,8 @@ static int strip_ioctl(struct tty_struct *tty, struct file *file,
return -EFAULT;
return set_mac_address(strip_info, &addr);
}
/*
* Allow stty to read, but not set, the serial port
*/
case TCGETS:
case TCGETA:
return n_tty_ioctl(tty, file, cmd, arg);
break;
default:
return -ENOIOCTLCMD;
return tty_mode_ioctl(tty, file, cmd, arg);
break;
}
return 0;