7 files changed, 20 insertions, 57 deletions

diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index e0119f6a3319..580cb4ab2af1 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -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;
-                        break;
-                }
+                                err = -EFAULT;
+                                break;
+                        }
 
-                netif_tx_lock_bh(dev);
-                memcpy(dev->dev_addr, &addr, AX25_ADDR_LEN);
-                netif_tx_unlock_bh(dev);
+                        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;
+                        err = 0;
+                        break;
+                }
 
         default:
-                err = -ENOIOCTLCMD;
+                err = tty_mode_ioctl(tty, file, cmd, arg);
         }
 
         sp_put(sp);
diff --git a/drivers/net/irda/irtty-sir.c b/drivers/net/irda/irtty-sir.c
index 2c6f7be36e8a..fc753d7f674e 100644
--- a/drivers/net/irda/irtty-sir.c
+++ b/drivers/net/irda/irtty-sir.c
@@ -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;
diff --git a/drivers/net/ppp_async.c b/drivers/net/ppp_async.c
index 27f5b904f48e..8d278c87ba48 100644
--- a/drivers/net/ppp_async.c
+++ b/drivers/net/ppp_async.c
@@ -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);
diff --git a/drivers/net/ppp_synctty.c b/drivers/net/ppp_synctty.c
index ce64032a465a..00e2fb48b4ae 100644
--- a/drivers/net/ppp_synctty.c
+++ b/drivers/net/ppp_synctty.c
@@ -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);
diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index 335b7cc80eba..251a3ce376ac 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -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);
         }
 }
 
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index c48b1cc63fd5..1e89d4de1bb7 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -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);
         }
 }
 
diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c
index 4bd14b331862..88efe1bae58f 100644
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
@@ -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;