From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Mon, 6 Aug 2012 22:34:45 +0000 (+0200)
Subject: compat-wireless: add missing part to tty-termios backport
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=76b141ea0554a15e460bdb373f12e8014abaabf5;p=openwrt%2Fstaging%2Fblogic.git

compat-wireless: add missing part to tty-termios backport

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>
---

diff --git a/patches/63-tty-termios.patch b/patches/63-tty-termios.patch
index b868ae973836..0841106e5695 100644
--- a/patches/63-tty-termios.patch
+++ b/patches/63-tty-termios.patch
@@ -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);
+