compat-wireless: add missing part to tty-termios backport
authorHauke Mehrtens <hauke@hauke-m.de>
Mon, 6 Aug 2012 22:34:45 +0000 (00:34 +0200)
committerLuis R. Rodriguez <mcgrof@frijolero.org>
Tue, 7 Aug 2012 19:30:33 +0000 (12:30 -0700)
This part was missing in the original patch

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>
patches/63-tty-termios.patch

index b868ae973836dc01b7dca3e3a3c448d561304006..0841106e5695679662fa7f65e174bf91d7bfb3e6 100644 (file)
@@ -33,3 +33,17 @@ was not done through a static inline helper.
        ktermios.c_cflag &= ~CRTSCTS;
        tty_set_termios(tty, &ktermios);
  
+--- a/net/bluetooth/rfcomm/tty.c
++++ b/net/bluetooth/rfcomm/tty.c
+@@ -873,7 +873,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_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);