1 files changed, 0 insertions, 39 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
deleted file mode 100644
index bd2d054e..00000000
--- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/net/bluetooth/af_bluetooth.c
-+++ b/net/bluetooth/af_bluetooth.c
-@@ -104,8 +104,12 @@ void bt_sock_unregister(int proto)
- }
- EXPORT_SYMBOL(bt_sock_unregister);
- 
-+#if defined(CPTCFG_BACKPORT_OPTION_BT_SOCK_CREATE_NEEDS_KERN)
- static int bt_sock_create(struct net *net, struct socket *sock, int proto,
- 			  int kern)
-+#else
-+static int bt_sock_create(struct net *net, struct socket *sock, int proto)
-+#endif
- {
- 	int err;
- 
-@@ -123,7 +127,11 @@ static int bt_sock_create(struct net *ne
- 	read_lock(&bt_proto_lock);
- 
- 	if (bt_proto[proto] && try_module_get(bt_proto[proto]->owner)) {
-+#if defined(CPTCFG_BACKPORT_OPTION_BT_SOCK_CREATE_NEEDS_KERN)
- 		err = bt_proto[proto]->create(net, sock, proto, kern);
-+#else
-+		err = bt_proto[proto]->create(net, sock, proto);
-+#endif
- 		if (!err)
- 			bt_sock_reclassify_lock(sock->sk, proto);
- 		module_put(bt_proto[proto]->owner);
-@@ -459,7 +467,11 @@ int bt_sock_ioctl(struct socket *sock, u
- 		if (sk->sk_state == BT_LISTEN)
- 			return -EINVAL;
- 
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31))
- 		amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk);
-+#else
-+		amount = sk->sk_sndbuf - atomic_read(&sk->sk_wmem_alloc);
-+#endif
- 		if (amount < 0)
- 			amount = 0;
- 		err = put_user(amount, (int __user *) arg);