summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/16-bluetooth
diff options
context:
space:
mode:
Diffstat (limited to 'patches/collateral-evolutions/network/16-bluetooth')
-rw-r--r--patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch6
-rw-r--r--patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sysfs.patch4
-rw-r--r--patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch6
3 files changed, 8 insertions, 8 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
index 04a1276f..708ce3bd 100644
--- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch
+++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch
@@ -1,6 +1,6 @@
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
-@@ -103,8 +103,12 @@ void bt_sock_unregister(int proto)
+@@ -104,8 +104,12 @@ void bt_sock_unregister(int proto)
}
EXPORT_SYMBOL(bt_sock_unregister);
@@ -13,7 +13,7 @@
{
int err;
-@@ -122,7 +126,11 @@ static int bt_sock_create(struct net *ne
+@@ -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)) {
@@ -25,7 +25,7 @@
if (!err)
bt_sock_reclassify_lock(sock->sk, proto);
module_put(bt_proto[proto]->owner);
-@@ -463,7 +471,11 @@ int bt_sock_ioctl(struct socket *sock, u
+@@ -464,7 +472,11 @@ int bt_sock_ioctl(struct socket *sock, u
if (sk->sk_state == BT_LISTEN)
return -EINVAL;
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 e78767e5..404f5882 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
@@ -1,6 +1,6 @@
--- a/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c
-@@ -72,7 +72,11 @@ static struct attribute_group bt_link_gr
+@@ -53,7 +53,11 @@ static struct attribute_group bt_link_gr
.attrs = bt_link_attrs,
};
@@ -12,7 +12,7 @@
&bt_link_group,
NULL
};
-@@ -378,7 +382,11 @@ static struct attribute_group bt_host_gr
+@@ -186,7 +190,11 @@ static struct attribute_group bt_host_gr
.attrs = bt_host_attrs,
};
diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch
index 3e87fac7..5a9823af 100644
--- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch
+++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch
@@ -1,6 +1,6 @@
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
-@@ -616,8 +616,13 @@ static int l2cap_sock_setsockopt_old(str
+@@ -639,8 +639,13 @@ static int l2cap_sock_setsockopt_old(str
return err;
}
@@ -14,7 +14,7 @@
{
struct sock *sk = sock->sk;
struct l2cap_chan *chan = l2cap_pi(sk)->chan;
-@@ -1347,8 +1352,12 @@ static struct sock *l2cap_sock_alloc(str
+@@ -1379,8 +1384,12 @@ static struct sock *l2cap_sock_alloc(str
return sk;
}
@@ -27,7 +27,7 @@
{
struct sock *sk;
-@@ -1360,7 +1369,11 @@ static int l2cap_sock_create(struct net
+@@ -1392,7 +1401,11 @@ static int l2cap_sock_create(struct net
sock->type != SOCK_DGRAM && sock->type != SOCK_RAW)
return -ESOCKTNOSUPPORT;