From: Luis R. Rodriguez <mcgrof@frijolero.org>
Date: Tue, 29 May 2012 16:31:02 +0000 (-0700)
Subject: compat-wireless: fix b/patches/16-bluetooth.patch for next-20120524
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1f2be7942495d5711bb12eb2b0cdb96ff819910a;p=openwrt%2Fstaging%2Fblogic.git

compat-wireless: fix b/patches/16-bluetooth.patch for next-20120524

Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>
---

diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch
index 46794bb19bdb..d956defc76e8 100644
--- a/patches/16-bluetooth.patch
+++ b/patches/16-bluetooth.patch
@@ -84,14 +84,16 @@ here still, but for now we keep this here.
  	wake_up_process(session->task);
 --- a/net/bluetooth/hci_sock.c
 +++ b/net/bluetooth/hci_sock.c
-@@ -891,7 +891,11 @@ drop:
+@@ -882,8 +882,13 @@ drop:
  	goto done;
  }
  
 +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31))
- static int hci_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, unsigned int len)
+ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
+ 			       char __user *optval, unsigned int len)
 +#else
-+static int hci_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, int len)
++static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
++			       char __user *optval, int len)
 +#endif
  {
  	struct hci_ufilter uf = { .opcode = 0 };