summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-11-23 13:41:14 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2013-11-24 01:04:04 +0100
commitcfdbe263abd76e4dd9e0b345fcf672ebdac389a1 (patch)
treedd355176e08366b0d34efc7b37d583dfec76ed21
parent5e68649891b15e2bd0678e6a4c2183eee3c680cc (diff)
backports: refresh on next-20131122backports-20131122
== ckmake-report.log == 1 2.6.24 [ FAIL ] 2 2.6.25 [ OK ] 3 2.6.26 [ OK ] 4 2.6.27 [ OK ] 5 2.6.28 [ OK ] 6 2.6.29 [ OK ] 7 2.6.30 [ OK ] 8 2.6.31 [ OK ] 9 2.6.32 [ OK ] 10 2.6.33 [ OK ] 11 2.6.34 [ OK ] 12 2.6.35 [ OK ] 13 2.6.36 [ OK ] 14 2.6.37 [ OK ] 15 2.6.38 [ OK ] 16 2.6.39 [ OK ] 17 3.0.101 [ OK ] 18 3.1.10 [ OK ] 19 3.10.20 [ OK ] 20 3.11.9 [ OK ] 21 3.12.1 [ OK ] 22 3.13-rc1 [ OK ] 23 3.2.52 [ OK ] 24 3.3.8 [ OK ] 25 3.4.70 [ OK ] 26 3.5.7 [ OK ] 27 3.6.11 [ OK ] 28 3.7.10 [ OK ] 29 3.8.13 [ OK ] 30 3.9.11 [ OK ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch2
-rw-r--r--patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch4
-rw-r--r--patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch2
-rw-r--r--patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_sco.patch2
4 files changed, 5 insertions, 5 deletions
diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch
index 708ce3bd..bd2d054e 100644
--- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch
+++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch
@@ -25,7 +25,7 @@
if (!err)
bt_sock_reclassify_lock(sock->sk, proto);
module_put(bt_proto[proto]->owner);
-@@ -464,7 +472,11 @@ int bt_sock_ioctl(struct socket *sock, u
+@@ -459,7 +467,11 @@ int bt_sock_ioctl(struct socket *sock, u
if (sk->sk_state == BT_LISTEN)
return -EINVAL;
diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch
index af53d75b..8208629e 100644
--- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch
+++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch
@@ -1,6 +1,6 @@
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
-@@ -998,8 +998,13 @@ drop:
+@@ -996,8 +996,13 @@ drop:
goto done;
}
@@ -14,7 +14,7 @@
{
struct hci_ufilter uf = { .opcode = 0 };
struct sock *sk = sock->sk;
-@@ -1173,8 +1178,12 @@ static struct proto hci_sk_proto = {
+@@ -1171,8 +1176,12 @@ static struct proto hci_sk_proto = {
.obj_size = sizeof(struct hci_pinfo)
};
diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch
index 231ce597..88c8f311 100644
--- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch
+++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch
@@ -14,7 +14,7 @@
{
struct sock *sk;
-@@ -668,7 +673,11 @@ static int rfcomm_sock_setsockopt_old(st
+@@ -667,7 +672,11 @@ static int rfcomm_sock_setsockopt_old(st
return err;
}
diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_sco.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_sco.patch
index 4dc69987..57d4b61a 100644
--- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_sco.patch
+++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_sco.patch
@@ -13,7 +13,7 @@
{
struct sock *sk;
-@@ -722,7 +726,11 @@ static int sco_sock_recvmsg(struct kiocb
+@@ -721,7 +725,11 @@ static int sco_sock_recvmsg(struct kiocb
return bt_sock_recvmsg(iocb, sock, msg, len, flags);
}