summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/63-tty-termios
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2013-03-30 00:53:58 +0100
committerJohannes Berg <johannes@sipsolutions.net>2013-03-30 01:06:36 +0100
commit44706a520f6527c67e7f8b741812f11464babda2 (patch)
treeceba8de9f18d05fea9bb4d337391ed79a2bc7cf4 /patches/collateral-evolutions/network/63-tty-termios
parent5bf870f42dc0cf3e31522e05119c0a8f993a280e (diff)
split patches
This splits all patches into per-file patches. I've added the little tool I wrote as well (but it's hard to use). Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Diffstat (limited to 'patches/collateral-evolutions/network/63-tty-termios')
-rw-r--r--patches/collateral-evolutions/network/63-tty-termios/INFO21
-rw-r--r--patches/collateral-evolutions/network/63-tty-termios/drivers_bluetooth_hci_ath.c14
-rw-r--r--patches/collateral-evolutions/network/63-tty-termios/net_bluetooth_rfcomm_tty.c14
3 files changed, 49 insertions, 0 deletions
diff --git a/patches/collateral-evolutions/network/63-tty-termios/INFO b/patches/collateral-evolutions/network/63-tty-termios/INFO
new file mode 100644
index 00000000..a5e536d3
--- /dev/null
+++ b/patches/collateral-evolutions/network/63-tty-termios/INFO
@@ -0,0 +1,21 @@
+This patch requires a manual backport:
+
+commit adc8d746caa67fff4b53ba3e5163a6cbacc3b523
+Author: Alan Cox <alan@linux.intel.com>
+Date: Sat Jul 14 15:31:47 2012 +0100
+
+ tty: move the termios object into the tty
+
+ This will let us sort out a whole pile of tty related races. The
+ alternative would be to keep points and refcount the termios objects.
+ However
+ 1. They are tiny anyway
+ 2. Many devices don't use the stored copies
+ 3. We can remove a pty special case
+
+ Signed-off-by: Alan Cox <alan@linux.intel.com>
+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+We cannot use compat.git for this given that the assignment
+was not done through a static inline helper.
+
diff --git a/patches/collateral-evolutions/network/63-tty-termios/drivers_bluetooth_hci_ath.c b/patches/collateral-evolutions/network/63-tty-termios/drivers_bluetooth_hci_ath.c
new file mode 100644
index 00000000..8108b775
--- /dev/null
+++ b/patches/collateral-evolutions/network/63-tty-termios/drivers_bluetooth_hci_ath.c
@@ -0,0 +1,14 @@
+--- a/drivers/bluetooth/hci_ath.c
++++ b/drivers/bluetooth/hci_ath.c
+@@ -58,7 +58,11 @@
+ return status;
+
+ /* Disable Automatic RTSCTS */
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0))
+ ktermios = tty->termios;
++#else
++ memcpy(&ktermios, tty->termios, sizeof(ktermios));
++#endif
+ ktermios.c_cflag &= ~CRTSCTS;
+ tty_set_termios(tty, &ktermios);
+
diff --git a/patches/collateral-evolutions/network/63-tty-termios/net_bluetooth_rfcomm_tty.c b/patches/collateral-evolutions/network/63-tty-termios/net_bluetooth_rfcomm_tty.c
new file mode 100644
index 00000000..4e93ae5b
--- /dev/null
+++ b/patches/collateral-evolutions/network/63-tty-termios/net_bluetooth_rfcomm_tty.c
@@ -0,0 +1,14 @@
+--- a/net/bluetooth/rfcomm/tty.c
++++ b/net/bluetooth/rfcomm/tty.c
+@@ -868,7 +868,11 @@
+
+ static void rfcomm_tty_set_termios(struct tty_struct *tty, struct ktermios *old)
+ {
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(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);
+