summaryrefslogtreecommitdiff
path: root/patches
diff options
context:
space:
mode:
authorLuciano Coelho <coelho@ti.com>2012-02-17 11:49:00 +0200
committerLuis R. Rodriguez <mcgrof@frijolero.org>2012-02-17 15:53:40 -0800
commit053c90222b34b0a17769a01d1bc6e7756e9605db (patch)
treebb8f860407c7ba6638448d917a5e5c4674e9328a /patches
parent3d69215c59b4f34732ed0baa0c4bc91ce8f85409 (diff)
compat-wireless: update bluetooth patch to latest wireless-testing
There is a small change in the bt_sock_unregister() function in af_bluetooth (an extra if) that cause the patch not to apply anymore. Signed-off-by: Luciano Coelho <coelho@ti.com> Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>
Diffstat (limited to 'patches')
-rw-r--r--patches/16-bluetooth.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch
index da533cff..3f433075 100644
--- a/patches/16-bluetooth.patch
+++ b/patches/16-bluetooth.patch
@@ -63,9 +63,9 @@ here still, but for now we keep this here.
+#else
+ err = bt_proto[proto]->create(net, sock, proto);
+#endif
- bt_sock_reclassify_lock(sock, proto);
+ if (!err)
+ bt_sock_reclassify_lock(sock->sk, proto);
module_put(bt_proto[proto]->owner);
- }
@@ -475,7 +483,11 @@ int bt_sock_ioctl(struct socket *sock, u
if (sk->sk_state == BT_LISTEN)
return -EINVAL;