From 54daf7d1ee3a332cdbfe57b3db2b9d99faaa2fa8 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Mon, 5 Oct 2009 12:23:48 +0200 Subject: [PATCH] --- yaml --- r: 172171 b: refs/heads/master c: eae38eede2e5f70d65f09327297bd698b0d3ea7e h: refs/heads/master i: 172169: 134d3a1064137aa2dcda9af66820a8d6ca8aacaf 172167: 6546d0ebf75fb224baf49946afaa9297cb257158 v: v3 --- [refs] | 2 +- trunk/net/bluetooth/rfcomm/core.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 94a7f06aa713..f6f6d5c240af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5fbcd3d1a07e234583e17830e8aef47282c22141 +refs/heads/master: eae38eede2e5f70d65f09327297bd698b0d3ea7e diff --git a/trunk/net/bluetooth/rfcomm/core.c b/trunk/net/bluetooth/rfcomm/core.c index 25692bc0a342..fc5ee3296e22 100644 --- a/trunk/net/bluetooth/rfcomm/core.c +++ b/trunk/net/bluetooth/rfcomm/core.c @@ -51,6 +51,7 @@ static int disable_cfc = 0; static int channel_mtu = -1; static unsigned int l2cap_mtu = RFCOMM_MAX_L2CAP_MTU; +static int l2cap_ertm = 0; static struct task_struct *rfcomm_thread; @@ -702,6 +703,8 @@ static struct rfcomm_session *rfcomm_session_create(bdaddr_t *src, bdaddr_t *dst sk = sock->sk; lock_sock(sk); l2cap_pi(sk)->imtu = l2cap_mtu; + if (l2cap_ertm) + l2cap_pi(sk)->mode = L2CAP_MODE_ERTM; release_sock(sk); s = rfcomm_session_add(sock, BT_BOUND); @@ -2185,6 +2188,9 @@ MODULE_PARM_DESC(channel_mtu, "Default MTU for the RFCOMM channel"); module_param(l2cap_mtu, uint, 0644); MODULE_PARM_DESC(l2cap_mtu, "Default MTU for the L2CAP connection"); +module_param(l2cap_ertm, bool, 0644); +MODULE_PARM_DESC(l2cap_ertm, "Use L2CAP ERTM mode for connection"); + MODULE_AUTHOR("Marcel Holtmann "); MODULE_DESCRIPTION("Bluetooth RFCOMM ver " VERSION); MODULE_VERSION(VERSION);