From 8a365a234058d5e5b7ac98ccdd5e7ef033826203 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 12 Sep 2021 10:59:38 +0200 Subject: [PATCH] Revert "tty: drop termiox user definitions" This reverts commit d24347e2ff1193164224e5c0558e8682e28e91f6 which is commit c762a2b846b619c0f92f23e2e8e16f70d20df800 upstream. It does nothing but mess with the CRC values of a number of structures. This is why people hate the kernel's crc "detection" logic as sometimes it does very odd things. So revert it, to preserve the KABI reporting, no functional change at all. Fixes: c8de3a470aaf ("Merge 5.10.64 into android12-5.10-lts") Signed-off-by: Greg Kroah-Hartman Change-Id: I4611b93aa3c192b82b2c2283ef6a33b19fac0e64 --- include/uapi/linux/termios.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/uapi/linux/termios.h b/include/uapi/linux/termios.h index e6da9d4433d1..33961d4e4de0 100644 --- a/include/uapi/linux/termios.h +++ b/include/uapi/linux/termios.h @@ -5,4 +5,19 @@ #include #include +#define NFF 5 + +struct termiox +{ + __u16 x_hflag; + __u16 x_cflag; + __u16 x_rflag[NFF]; + __u16 x_sflag; +}; + +#define RTSXOFF 0x0001 /* RTS flow control on input */ +#define CTSXON 0x0002 /* CTS flow control on output */ +#define DTRXOFF 0x0004 /* DTR flow control on input */ +#define DSRXON 0x0008 /* DCD flow control on output */ + #endif