diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2017-02-07 23:04:11 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-02-09 14:52:26 +0100 |
| commit | e13e44d9a81da4bf77d9869db5b4764fc0811d9f (patch) | |
| tree | c610ae2b0f634df75fe88f65a047e5c741c9b0af /patches/0020-tty-termios | |
| parent | 46939c43903da6b202c95a0fcb24acce55fd63c0 (diff) | |
backports: always use new version compare macros
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/0020-tty-termios')
| -rw-r--r-- | patches/0020-tty-termios/net_bluetooth_hci_ldisc.patch | 8 | ||||
| -rw-r--r-- | patches/0020-tty-termios/net_bluetooth_rfcomm_tty.patch | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/patches/0020-tty-termios/net_bluetooth_hci_ldisc.patch b/patches/0020-tty-termios/net_bluetooth_hci_ldisc.patch index d1c6b64f..81371523 100644 --- a/patches/0020-tty-termios/net_bluetooth_hci_ldisc.patch +++ b/patches/0020-tty-termios/net_bluetooth_hci_ldisc.patch @@ -12,7 +12,7 @@ if (enable) { /* Disable hardware flow control */ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)) ++#if LINUX_VERSION_IS_GEQ(3,7,0) ktermios = tty->termios; +#else + ktermios = *tty->termios; @@ -24,7 +24,7 @@ BT_DBG("Setting RTS: %s", status ? "failed" : "success"); /* Re-enable hardware flow control */ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)) ++#if LINUX_VERSION_IS_GEQ(3,7,0) ktermios = tty->termios; +#else + ktermios = *tty->termios; @@ -36,7 +36,7 @@ struct ktermios ktermios; /* Bring the UART into a known 8 bits no parity hw fc state */ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)) ++#if LINUX_VERSION_IS_GEQ(3,7,0) ktermios = tty->termios; +#else + ktermios = *tty->termios; @@ -48,7 +48,7 @@ struct tty_struct *tty = hu->tty; struct ktermios ktermios; -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)) ++#if LINUX_VERSION_IS_GEQ(3,7,0) ktermios = tty->termios; +#else + ktermios = *tty->termios; diff --git a/patches/0020-tty-termios/net_bluetooth_rfcomm_tty.patch b/patches/0020-tty-termios/net_bluetooth_rfcomm_tty.patch index 780d0b97..71aa75dd 100644 --- a/patches/0020-tty-termios/net_bluetooth_rfcomm_tty.patch +++ b/patches/0020-tty-termios/net_bluetooth_rfcomm_tty.patch @@ -4,7 +4,7 @@ static void rfcomm_tty_set_termios(struct tty_struct *tty, struct ktermios *old) { -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)) ++#if LINUX_VERSION_IS_GEQ(3,7,0) struct ktermios *new = &tty->termios; +#else + struct ktermios *new = tty->termios; |