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_hci_sock.patch4
-rw-r--r--patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch6
-rw-r--r--patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch4
-rw-r--r--patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_tty.patch6
4 files changed, 10 insertions, 10 deletions
diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch
index 5798965c..268f6479 100644
--- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch
+++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch
@@ -1,6 +1,6 @@
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
-@@ -1003,8 +1003,13 @@ drop:
+@@ -1002,8 +1002,13 @@ drop:
goto done;
}
@@ -14,7 +14,7 @@
{
struct hci_ufilter uf = { .opcode = 0 };
struct sock *sk = sock->sk;
-@@ -1178,8 +1183,12 @@ static struct proto hci_sk_proto = {
+@@ -1177,8 +1182,12 @@ static struct proto hci_sk_proto = {
.obj_size = sizeof(struct hci_pinfo)
};
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 e5e7c75f..cdf759f8 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
-@@ -733,8 +733,13 @@ static int l2cap_sock_setsockopt_old(str
+@@ -726,8 +726,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;
-@@ -1527,8 +1532,12 @@ static struct sock *l2cap_sock_alloc(str
+@@ -1524,8 +1529,12 @@ static struct sock *l2cap_sock_alloc(str
return sk;
}
@@ -27,7 +27,7 @@
{
struct sock *sk;
-@@ -1540,7 +1549,11 @@ static int l2cap_sock_create(struct net
+@@ -1537,7 +1546,11 @@ static int l2cap_sock_create(struct net
sock->type != SOCK_DGRAM && sock->type != SOCK_RAW)
return -ESOCKTNOSUPPORT;
diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch
index f6b84b57..88c8f311 100644
--- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch
+++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch
@@ -1,6 +1,6 @@
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
-@@ -310,8 +310,13 @@ static struct sock *rfcomm_sock_alloc(st
+@@ -305,8 +305,13 @@ static struct sock *rfcomm_sock_alloc(st
return sk;
}
@@ -14,7 +14,7 @@
{
struct sock *sk;
-@@ -681,7 +686,11 @@ static int rfcomm_sock_setsockopt_old(st
+@@ -667,7 +672,11 @@ static int rfcomm_sock_setsockopt_old(st
return err;
}
diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_tty.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_tty.patch
index 286e1670..1013610a 100644
--- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_tty.patch
+++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_tty.patch
@@ -1,6 +1,6 @@
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
-@@ -822,7 +822,11 @@ static int rfcomm_tty_write_room(struct
+@@ -796,7 +796,11 @@ static int rfcomm_tty_write_room(struct
return room;
}
@@ -12,7 +12,7 @@
{
BT_DBG("tty %p cmd 0x%02x", tty, cmd);
-@@ -1071,7 +1075,11 @@ static void rfcomm_tty_hangup(struct tty
+@@ -1045,7 +1049,11 @@ static void rfcomm_tty_hangup(struct tty
tty_port_hangup(&dev->port);
}
@@ -24,7 +24,7 @@
{
struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
-@@ -1080,7 +1088,11 @@ static int rfcomm_tty_tiocmget(struct tt
+@@ -1054,7 +1062,11 @@ static int rfcomm_tty_tiocmget(struct tt
return dev->modem_status;
}