diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-09-23 19:45:27 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-09-24 09:28:51 +0200 |
| commit | 3ae3cf6154a6d4e929396f2694b68714a9ce237b (patch) | |
| tree | 45c5b832c3be8fa2c06c0687088894d9a2956ddf /patches/0061-termios_rwsem | |
| parent | 1b4e6ad4d927c7998fa578f2d29e0c4ec01a9217 (diff) | |
backports: Remove NFC support
I am not aware of any user of the NFC coded in backports, at least I
haven't seen any patches regarding this. Remove this code to reduce the
efforts needed in the backports project.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/0061-termios_rwsem')
| -rw-r--r-- | patches/0061-termios_rwsem/nfc.patch | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/patches/0061-termios_rwsem/nfc.patch b/patches/0061-termios_rwsem/nfc.patch deleted file mode 100644 index c8ad8b46..00000000 --- a/patches/0061-termios_rwsem/nfc.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/net/nfc/nci/uart.c -+++ b/net/nfc/nci/uart.c -@@ -439,9 +439,17 @@ void nci_uart_set_config(struct nci_uart - if (!nu->tty) - return; - -+#if LINUX_VERSION_IS_GEQ(3,12,0) - down_read(&nu->tty->termios_rwsem); -+#else -+ mutex_lock(&nu->tty->termios_mutex); -+#endif /* if LINUX_VERSION_IS_GEQ(3,12,0) */ - new_termios = nu->tty->termios; -+#if LINUX_VERSION_IS_GEQ(3,12,0) - up_read(&nu->tty->termios_rwsem); -+#else -+ mutex_unlock(&nu->tty->termios_mutex); -+#endif /* if LINUX_VERSION_IS_GEQ(3,12,0) */ - tty_termios_encode_baud_rate(&new_termios, baudrate, baudrate); - - if (flow_ctrl) |