Bluetooth: Officially enable LE CoC support
Subsystems (2)
PATCH 1/1 Bluetooth: Officially enable LE CoC support
From: Johan Hedberg <[email protected]>
Now that the LE Connection oriented Channel support has undergone a decent amount of testing we can make it officially supported. This patch removes the enable_lecoc debugfs switch which was previously needed to enable support for LE CoC.
--- net/bluetooth/l2cap_core.c | 11 ----------- net/bluetooth/l2cap_sock.c | 29 ----------------------------- 2 files changed, 40 deletions(-)
net/bluetooth/l2cap_core.c +0 -11
@@ -5544,17 +5544,6 @@ static inline int l2cap_le_sig_cmd(struct l2cap_conn *conn, {int err =0 ; -if (!enable_lecoc) { -switch (cmd->code) { -case L2CAP_LE_CONN_REQ : -case L2CAP_LE_CONN_RSP : -case L2CAP_LE_CREDITS : -case L2CAP_DISCONN_REQ : -case L2CAP_DISCONN_RSP : -return -EINVAL ; - } - } -switch (cmd->code) {case L2CAP_COMMAND_REJ :l2cap_le_command_rej (conn, cmd, cmd_len, data);
net/bluetooth/l2cap_sock.c +0 -29
@@ -36,8 +36,6 @@#include "smp.h" -bool enable_lecoc; -static struct bt_sock_list l2cap_sk_list = { .lock =__RW_LOCK_UNLOCKED (l2cap_sk_list.lock) };
@@ -111,8 +109,6 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen) }if (bdaddr_type_is_le (la.l2_bdaddr_type)) { -if (!enable_lecoc && la.l2_psm) -return -EINVAL ;/* We only allow ATT user space socket */ if (la.l2_cid && la.l2_cid !=__constant_cpu_to_le16 (L2CAP_CID_ATT ))
@@ -229,8 +225,6 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr,return -EINVAL ;if (bdaddr_type_is_le (la.l2_bdaddr_type)) { -if (!enable_lecoc && la.l2_psm) -return -EINVAL ;/* We only allow ATT user space socket */ if (la.l2_cid && la.l2_cid !=__constant_cpu_to_le16 (L2CAP_CID_ATT ))
@@ -578,11 +572,6 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname,break ;case BT_SNDMTU : -if (!enable_lecoc) { - err = -EPROTONOSUPPORT ; -break ; - } -if (!bdaddr_type_is_le (chan->src_type)) { err = -EINVAL ;break ;
@@ -598,11 +587,6 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname,break ;case BT_RCVMTU : -if (!enable_lecoc) { - err = -EPROTONOSUPPORT ; -break ; - } -if (!bdaddr_type_is_le (chan->src_type)) { err = -EINVAL ;break ;
@@ -919,11 +903,6 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,break ;case BT_SNDMTU : -if (!enable_lecoc) { - err = -EPROTONOSUPPORT ; -break ; - } -if (!bdaddr_type_is_le (chan->src_type)) { err = -EINVAL ;break ;
@@ -936,11 +915,6 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,break ;case BT_RCVMTU : -if (!enable_lecoc) { - err = -EPROTONOSUPPORT ; -break ; - } -if (!bdaddr_type_is_le (chan->src_type)) { err = -EINVAL ;break ;
@@ -1643,6 +1617,3 @@ void l2cap_cleanup_sockets(void)bt_sock_unregister (BTPROTO_L2CAP );proto_unregister (&l2cap_proto); } - -module_param (enable_lecoc, bool,0644 ); -MODULE_PARM_DESC (enable_lecoc,"Enable support for LE CoC" );
Signature · 1 line
1.8.5.3
Marcel Holtmann
maintainerHi Johan,
Quoted 10 lines
Now that the LE Connection oriented Channel support has undergone a decent amount of testing we can make it officially supported. This patch removes the
enable_lecocdebugfs switch which was previously needed to enable support for LE CoC.Signed-off-by Johan Hedberg <[email protected]>---
net/bluetooth/l2cap_core.c| 11 -----------net/bluetooth/l2cap_sock.c| 29 -----------------------------2 files changed, 40 deletions(-)
I had to fix the description a bit ;)
Patch has been applied to bluetooth-next tree.
Regards
Marcel