summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/16-bluetooth
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-05-10 17:27:03 -0700
committerJohannes Berg <johannes.berg@intel.com>2013-05-13 13:20:52 +0200
commitf4c9d9a279a01a4cd6f670e5518e3e6431a3f818 (patch)
tree766142c20c0612f6a7bbb58af34b0c71edb50c2b /patches/collateral-evolutions/network/16-bluetooth
parent7ca0afbf22d30de39502a1836132063d7d157bcf (diff)
backports: refresh patches for next-20130419
== ckmake-report.log == 1 2.6.24 [ OK ] 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.76 [ OK ] 18 3.1.10 [ OK ] 19 3.2.44 [ OK ] 20 3.3.8 [ OK ] 21 3.4.43 [ OK ] 22 3.5.7 [ OK ] 23 3.6.11 [ OK ] 24 3.7.10 [ OK ] 25 3.8.11 [ OK ] 26 3.9.0 [ OK ] real 30m44.234s user 813m54.992s sys 126m44.115s Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/collateral-evolutions/network/16-bluetooth')
-rw-r--r--patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sysfs.patch2
-rw-r--r--patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_sock.patch2
-rw-r--r--patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_sco.patch2
3 files changed, 3 insertions, 3 deletions
diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sysfs.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sysfs.patch
index ac74a0e5..4def823e 100644
--- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sysfs.patch
+++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sysfs.patch
@@ -24,7 +24,7 @@
put_device(dev);
}
-@@ -379,7 +387,11 @@ static struct attribute_group bt_host_gr
+@@ -378,7 +386,11 @@ static struct attribute_group bt_host_gr
.attrs = bt_host_attrs,
};
diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_sock.patch
index b7bb6531..3bd46444 100644
--- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_sock.patch
+++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_sock.patch
@@ -1,6 +1,6 @@
--- a/net/bluetooth/hidp/sock.c
+++ b/net/bluetooth/hidp/sock.c
-@@ -235,8 +235,12 @@ static struct proto hidp_proto = {
+@@ -226,8 +226,12 @@ static struct proto hidp_proto = {
.obj_size = sizeof(struct bt_sock)
};
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 6b6d9a5d..bc63111a 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;
-@@ -675,7 +679,11 @@ static int sco_sock_recvmsg(struct kiocb
+@@ -711,7 +715,11 @@ static int sco_sock_recvmsg(struct kiocb
return bt_sock_recvmsg(iocb, sock, msg, len, flags);
}