diff options
Diffstat (limited to 'net/bluetooth')
-rw-r--r-- | net/bluetooth/rfcomm/core.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index 25692bc0a342..fc5ee3296e22 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c | |||
@@ -51,6 +51,7 @@ | |||
51 | static int disable_cfc = 0; | 51 | static int disable_cfc = 0; |
52 | static int channel_mtu = -1; | 52 | static int channel_mtu = -1; |
53 | static unsigned int l2cap_mtu = RFCOMM_MAX_L2CAP_MTU; | 53 | static unsigned int l2cap_mtu = RFCOMM_MAX_L2CAP_MTU; |
54 | static int l2cap_ertm = 0; | ||
54 | 55 | ||
55 | static struct task_struct *rfcomm_thread; | 56 | static struct task_struct *rfcomm_thread; |
56 | 57 | ||
@@ -702,6 +703,8 @@ static struct rfcomm_session *rfcomm_session_create(bdaddr_t *src, bdaddr_t *dst | |||
702 | sk = sock->sk; | 703 | sk = sock->sk; |
703 | lock_sock(sk); | 704 | lock_sock(sk); |
704 | l2cap_pi(sk)->imtu = l2cap_mtu; | 705 | l2cap_pi(sk)->imtu = l2cap_mtu; |
706 | if (l2cap_ertm) | ||
707 | l2cap_pi(sk)->mode = L2CAP_MODE_ERTM; | ||
705 | release_sock(sk); | 708 | release_sock(sk); |
706 | 709 | ||
707 | s = rfcomm_session_add(sock, BT_BOUND); | 710 | s = rfcomm_session_add(sock, BT_BOUND); |
@@ -2185,6 +2188,9 @@ MODULE_PARM_DESC(channel_mtu, "Default MTU for the RFCOMM channel"); | |||
2185 | module_param(l2cap_mtu, uint, 0644); | 2188 | module_param(l2cap_mtu, uint, 0644); |
2186 | MODULE_PARM_DESC(l2cap_mtu, "Default MTU for the L2CAP connection"); | 2189 | MODULE_PARM_DESC(l2cap_mtu, "Default MTU for the L2CAP connection"); |
2187 | 2190 | ||
2191 | module_param(l2cap_ertm, bool, 0644); | ||
2192 | MODULE_PARM_DESC(l2cap_ertm, "Use L2CAP ERTM mode for connection"); | ||
2193 | |||
2188 | MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); | 2194 | MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); |
2189 | MODULE_DESCRIPTION("Bluetooth RFCOMM ver " VERSION); | 2195 | MODULE_DESCRIPTION("Bluetooth RFCOMM ver " VERSION); |
2190 | MODULE_VERSION(VERSION); | 2196 | MODULE_VERSION(VERSION); |