tty: add more tty_port fields

Move more bits into the tty_port structure

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 4 insertions, 4 deletions

diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h
index a982b74a6ee6..2d3d1e04ba92 100644
--- a/include/linux/cyclades.h
+++ b/include/linux/cyclades.h
@@ -567,8 +567,6 @@ struct cyclades_port {
         int                     chip_rev;
         int                     custom_divisor;
         u8                      x_char; /* to be pushed out ASAP */
-        int                     close_delay;
-        unsigned short          closing_wait;
         int                     breakon;
         int                     breakoff;
         int                     xmit_head;
@@ -586,8 +584,8 @@ struct cyclades_port {
 };
 
 #define CLOSING_WAIT_DELAY      30*HZ
-#define CY_CLOSING_WAIT_NONE    65535
-#define CY_CLOSING_WAIT_INF     0
+#define CY_CLOSING_WAIT_NONE    ASYNC_CLOSING_WAIT_NONE
+#define CY_CLOSING_WAIT_INF     ASYNC_CLOSING_WAIT_INF
 
 
 #define CyMAX_CHIPS_PER_CARD    8
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 46008e86b191..4e5833073aa6 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -188,6 +188,8 @@ struct tty_port {
         unsigned long           flags;          /* TTY flags ASY_*/
         struct mutex            mutex;          /* Locking */
         unsigned char           *xmit_buf;      /* Optional buffer */
+        int                     close_delay;    /* Close port delay */
+        int                     closing_wait;   /* Delay for output */
 };
 
 /*