From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH BlueZ] btio: Fix not translation mode to L2CAP mode
Date: Fri, 5 Jun 2020 10:59:42 -0700 [thread overview]
Message-ID: <20200605175942.719436-1-luiz.dentz@gmail.com> (raw)
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
When using L2CAP_OPTIONS legacy modes need to be used since they are
not compatible with BT_MODE.
---
btio/btio.c | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/btio/btio.c b/btio/btio.c
index 13c731062..844d6007f 100644
--- a/btio/btio.c
+++ b/btio/btio.c
@@ -597,6 +597,20 @@ static gboolean get_key_size(int sock, int *size, GError **err)
return FALSE;
}
+static uint8_t mode_l2mode(uint8_t mode)
+{
+ switch (mode) {
+ case BT_IO_MODE_BASIC:
+ return L2CAP_MODE_BASIC;
+ case BT_IO_MODE_ERTM:
+ return L2CAP_MODE_ERTM;
+ case BT_IO_MODE_STREAMING:
+ return L2CAP_MODE_STREAMING;
+ default:
+ return UINT8_MAX;
+ }
+}
+
static gboolean set_l2opts(int sock, uint16_t imtu, uint16_t omtu,
uint8_t mode, GError **err)
{
@@ -614,8 +628,14 @@ static gboolean set_l2opts(int sock, uint16_t imtu, uint16_t omtu,
l2o.imtu = imtu;
if (omtu)
l2o.omtu = omtu;
- if (mode)
- l2o.mode = mode;
+
+ if (mode) {
+ l2o.mode = mode_l2mode(mode);
+ if (l2o.mode == UINT8_MAX) {
+ ERROR_FAILED(err, "Unsupported mode", errno);
+ return FALSE;
+ }
+ }
if (setsockopt(sock, SOL_L2CAP, L2CAP_OPTIONS, &l2o, sizeof(l2o)) < 0) {
ERROR_FAILED(err, "setsockopt(L2CAP_OPTIONS)", errno);
--
2.25.3
next reply other threads:[~2020-06-05 17:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-05 17:59 Luiz Augusto von Dentz [this message]
2020-06-05 23:26 ` [PATCH BlueZ] btio: Fix not translation mode to L2CAP mode Luiz Augusto von Dentz
2020-06-08 13:40 ` Marijn Suijten
2020-06-08 15:54 ` Luiz Augusto von Dentz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200605175942.719436-1-luiz.dentz@gmail.com \
--to=luiz.dentz@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox