diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-09-17 23:31:36 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2018-09-19 11:04:33 +0200 |
commit | ab3fd3b9a801a9faa2619e2e65207e736f859a6d (patch) | |
tree | f0a6425fe00ba440e966570e662e6ff9c738d230 /patches/0020-tty-termios | |
parent | 30a378636e473278ff65800b1fe58822e36d716c (diff) |
backports: Remove unused parts
This removes parts which were only used by subsystems which are not
included in backports any more, for example media, bluetooth and
Ethernet.
The patches which are removed in this commit are not applied to the
kernel tree anyway with the default configuration because non of the
files get copied. The freezer, media, regulator and sound parts were
only used by the already removed media drivers. The flow dissector file
is not copied any more.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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 | 67 | ||||
-rw-r--r-- | patches/0020-tty-termios/net_bluetooth_rfcomm_tty.patch | 14 |
2 files changed, 0 insertions, 81 deletions
diff --git a/patches/0020-tty-termios/net_bluetooth_hci_ldisc.patch b/patches/0020-tty-termios/net_bluetooth_hci_ldisc.patch deleted file mode 100644 index 81371523..00000000 --- a/patches/0020-tty-termios/net_bluetooth_hci_ldisc.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- a/drivers/bluetooth/hci_ldisc.c -+++ b/drivers/bluetooth/hci_ldisc.c -@@ -24,6 +24,7 @@ - */ - - #include <linux/module.h> -+#include <linux/version.h> - - #include <linux/kernel.h> - #include <linux/init.h> -@@ -269,7 +270,11 @@ void hci_uart_set_flow_control(struct hc - - if (enable) { - /* Disable hardware flow control */ -+#if LINUX_VERSION_IS_GEQ(3,7,0) - ktermios = tty->termios; -+#else -+ ktermios = *tty->termios; -+#endif - ktermios.c_cflag &= ~CRTSCTS; - status = tty_set_termios(tty, &ktermios); - BT_DBG("Disabling hardware flow control: %s", -@@ -303,7 +308,11 @@ void hci_uart_set_flow_control(struct hc - BT_DBG("Setting RTS: %s", status ? "failed" : "success"); - - /* Re-enable hardware flow control */ -+#if LINUX_VERSION_IS_GEQ(3,7,0) - ktermios = tty->termios; -+#else -+ ktermios = *tty->termios; -+#endif - ktermios.c_cflag |= CRTSCTS; - status = tty_set_termios(tty, &ktermios); - BT_DBG("Enabling hardware flow control: %s", -@@ -324,7 +333,11 @@ void hci_uart_init_tty(struct hci_uart * - struct ktermios ktermios; - - /* Bring the UART into a known 8 bits no parity hw fc state */ -+#if LINUX_VERSION_IS_GEQ(3,7,0) - ktermios = tty->termios; -+#else -+ ktermios = *tty->termios; -+#endif - ktermios.c_iflag &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP | - INLCR | IGNCR | ICRNL | IXON); - ktermios.c_oflag &= ~OPOST; -@@ -342,7 +355,11 @@ void hci_uart_set_baudrate(struct hci_ua - struct tty_struct *tty = hu->tty; - struct ktermios ktermios; - -+#if LINUX_VERSION_IS_GEQ(3,7,0) - ktermios = tty->termios; -+#else -+ ktermios = *tty->termios; -+#endif - ktermios.c_cflag &= ~CBAUD; - tty_termios_encode_baud_rate(&ktermios, speed, speed); - -@@ -350,7 +367,7 @@ void hci_uart_set_baudrate(struct hci_ua - tty_set_termios(tty, &ktermios); - - BT_DBG("%s: New tty speeds: %d/%d", hu->hdev->name, -- tty->termios.c_ispeed, tty->termios.c_ospeed); -+ ktermios.c_ispeed, ktermios.c_ospeed); - } - - static int hci_uart_setup(struct hci_dev *hdev) diff --git a/patches/0020-tty-termios/net_bluetooth_rfcomm_tty.patch b/patches/0020-tty-termios/net_bluetooth_rfcomm_tty.patch deleted file mode 100644 index 71aa75dd..00000000 --- a/patches/0020-tty-termios/net_bluetooth_rfcomm_tty.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/net/bluetooth/rfcomm/tty.c -+++ b/net/bluetooth/rfcomm/tty.c -@@ -869,7 +869,11 @@ static int rfcomm_tty_ioctl(struct tty_s - - static void rfcomm_tty_set_termios(struct tty_struct *tty, struct ktermios *old) - { -+#if LINUX_VERSION_IS_GEQ(3,7,0) - struct ktermios *new = &tty->termios; -+#else -+ struct ktermios *new = tty->termios; -+#endif - int old_baud_rate = tty_termios_baud_rate(old); - int new_baud_rate = tty_termios_baud_rate(new); - |