compat-drivers: make patches apply again

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>

diff --git a/patches/network/16-bluetooth.patch b/patches/network/16-bluetooth.patch
index 6beba28a8058f306da15b174c869bdf073fc210d..57df268787b25c8c2ff40195a46e256b8c294aa3 100644 (file)
--- a/patches/network/16-bluetooth.patch
+++ b/patches/network/16-bluetooth.patch
@@ -534,22 +534,21 @@ here still, but for now we keep this here.
  
 --- a/net/bluetooth/l2cap_sock.c
 +++ b/net/bluetooth/l2cap_sock.c
-@@ -565,7 +565,14 @@ static int l2cap_sock_setsockopt_old(str
+@@ -573,8 +573,13 @@ static int l2cap_sock_setsockopt_old(str
        return err;
  }
  
-+
 +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31))
- static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, unsigned int optlen)
+ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
+                                char __user *optval, unsigned int optlen)
 +#else
-+static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, int optlen)
++static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
++                               char __user *optval, int optlen)
 +#endif
-+
-+
  {
        struct sock *sk = sock->sk;
        struct l2cap_chan *chan = l2cap_pi(sk)->chan;
-@@ -1196,8 +1203,12 @@ static struct sock *l2cap_sock_alloc(str
+@@ -1220,8 +1225,12 @@ static struct sock *l2cap_sock_alloc(str
        return sk;
  }
  
@@ -562,8 +561,8 @@ here still, but for now we keep this here.
  {
        struct sock *sk;
  
-@@ -1209,7 +1220,11 @@ static int l2cap_sock_create(struct net
-                       sock->type != SOCK_DGRAM && sock->type != SOCK_RAW)
+@@ -1233,7 +1242,11 @@ static int l2cap_sock_create(struct net
+           sock->type != SOCK_DGRAM && sock->type != SOCK_RAW)
                return -ESOCKTNOSUPPORT;
  
 +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,32))