From 7793930ad12f67c15bab95fa3cea34345472722f Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 7 Sep 2014 12:56:05 +0200 Subject: backports: refresh on v3.14.22 1 3.0.101 [ OK ] 2 3.1.10 [ OK ] 3 3.2.62 [ OK ] 4 3.3.8 [ OK ] 5 3.4.104 [ OK ] 6 3.5.7 [ OK ] 7 3.6.11 [ OK ] 8 3.7.10 [ OK ] 9 3.8.13 [ OK ] 10 3.9.11 [ OK ] 11 3.10.58 [ OK ] 12 3.11.10 [ OK ] 13 3.12.31 [ OK ] 14 3.13.11 [ OK ] 15 3.14.22 [ OK ] Signed-off-by: Hauke Mehrtens --- .../network/16-bluetooth/drivers_bluetooth_hci_ldisc.patch | 4 ++-- .../network/16-bluetooth/net_bluetooth_l2cap_sock.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'patches/collateral-evolutions/network/16-bluetooth') diff --git a/patches/collateral-evolutions/network/16-bluetooth/drivers_bluetooth_hci_ldisc.patch b/patches/collateral-evolutions/network/16-bluetooth/drivers_bluetooth_hci_ldisc.patch index c81496b7..86e54770 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/drivers_bluetooth_hci_ldisc.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/drivers_bluetooth_hci_ldisc.patch @@ -1,6 +1,6 @@ --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c -@@ -289,8 +289,13 @@ static int hci_uart_tty_open(struct tty_ +@@ -301,8 +301,13 @@ static int hci_uart_tty_open(struct tty_ /* FIXME: why is this needed. Note don't use ldisc_ref here as the open path is before the ldisc is referencable */ @@ -14,7 +14,7 @@ tty_driver_flush_buffer(tty); return 0; -@@ -519,7 +524,11 @@ static int hci_uart_tty_ioctl(struct tty +@@ -533,7 +538,11 @@ static int hci_uart_tty_ioctl(struct tty return hu->hdev_flags; default: diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch index cdf759f8..18ec06b6 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch @@ -14,7 +14,7 @@ { struct sock *sk = sock->sk; struct l2cap_chan *chan = l2cap_pi(sk)->chan; -@@ -1524,8 +1529,12 @@ static struct sock *l2cap_sock_alloc(str +@@ -1523,8 +1528,12 @@ static struct sock *l2cap_sock_alloc(str return sk; } @@ -27,7 +27,7 @@ { struct sock *sk; -@@ -1537,7 +1546,11 @@ static int l2cap_sock_create(struct net +@@ -1536,7 +1545,11 @@ static int l2cap_sock_create(struct net sock->type != SOCK_DGRAM && sock->type != SOCK_RAW) return -ESOCKTNOSUPPORT; -- cgit v1.2.3