* Re: [PATCH] android/pts: PTS test results for A2DP
From: Szymon Janc @ 2014-01-28 15:56 UTC (permalink / raw)
To: Sebastian Chlad; +Cc: linux-bluetooth
In-Reply-To: <1390911083-6188-1-git-send-email-sebastianx.chlad@intel.com>
Hi Sebastian,
On Tuesday 28 of January 2014 14:11:23 Sebastian Chlad wrote:
> ---
> android/pts-a2dp.txt | 20 +++++++++++---------
> 1 file changed, 11 insertions(+), 9 deletions(-)
>
> diff --git a/android/pts-a2dp.txt b/android/pts-a2dp.txt
> index c6eee62..67f9183 100644
> --- a/android/pts-a2dp.txt
> +++ b/android/pts-a2dp.txt
> @@ -1,7 +1,7 @@
> PTS test results for A2DP
>
> PTS version: 5.0
> -Tested: 24.01.2014
> +Tested: 28.01.2014
>
> Results:
> PASS test passed
> @@ -15,18 +15,20 @@ Test Name Result Notes
> ---------------------------------------------------------------------------
> ---- TC_SRC_CC_BV_09_I INC
> TC_SRC_CC_BV_10_I N/A
> -TC_SRC_REL_BV_01_I PASS
> +TC_SRC_REL_BV_01_I PASS Connect to PTS from IUT. When requested
> + disconnect from IUT
> TC_SRC_REL_BV_02_I PASS
> -TC_SRC_SET_BV_01_I PASS
> +TC_SRC_SET_BV_01_I PASS Connect to PTS (open a2dp)
> TC_SRC_SET_BV_02_I PASS
> -TC_SRC_SET_BV_03_I PASS
> -TC_SRC_SET_BV_04_I INC
> -TC_SRC_SET_BV_05_I INC
> -TC_SRC_SET_BV_06_I INC
> -TC_SRC_SUS_BV_01_I INC
> +TC_SRC_SET_BV_03_I PASS Start streaming
> +TC_SRC_SET_BV_04_I INC Start streaming
> +TC_SRC_SET_BV_05_I INC IUT must be moved out of range
> +TC_SRC_SET_BV_06_I INC IUT must be moved out of range
> +TC_SRC_SUS_BV_01_I PASS Stop streaming
> TC_SRC_SUS_BV_02_I INC
> TC_SRC_SDP_BV_01_I PASS
> -TC_SRC_AS_BV_01_I INC
> +TC_SRC_AS_BV_01_I PASS Requires checking if the output on the IUT is
> + correct
> ---------------------------------------------------------------------------
> ----
Applied, thanks.
--
BR
Szymon Janc
^ permalink raw reply
* Re: [PATCH] android/pts: Add PTS test results for AVRCP
From: Szymon Janc @ 2014-01-28 15:57 UTC (permalink / raw)
To: Sebastian Chlad; +Cc: linux-bluetooth
In-Reply-To: <1390911956-6714-1-git-send-email-sebastianx.chlad@intel.com>
Hi Sebastian,
On Tuesday 28 of January 2014 14:25:56 Sebastian Chlad wrote:
> ---
> android/pts-avrcp.txt | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/android/pts-avrcp.txt b/android/pts-avrcp.txt
> index f2533b4..6ad97f7 100644
> --- a/android/pts-avrcp.txt
> +++ b/android/pts-avrcp.txt
> @@ -1,7 +1,7 @@
> PTS test results for AVRCP
>
> PTS version: 5.0
> -Tested: --not yet tested--
> +Tested: 28.01.2014
>
> Results:
> PASS test passed
> @@ -91,17 +91,17 @@ Test Name Result Notes
> ---------------------------------------------------------------------------
> ---- TC_TG_BGN_BV_01_I N/A
> TC_TG_BGN_BV_02_I N/A
> -TC_TG_CEC_BV_01_I INC
> -TC_TG_CEC_BV_02_I INC
> +TC_TG_CEC_BV_01_I PASS
> +TC_TG_CEC_BV_02_I INC Initiate a control chanenel connection
> TC_TG_CFG_BI_01_C INC
> TC_TG_CFG_BV_02_C INC
> TC_TG_CON_BV_02_C N/A
> TC_TG_CON_BV_04_C N/A
> TC_TG_CON_BV_05_C N/A
> -TC_TG_CRC_BV_01_I INC
> -TC_TG_CRC_BV_02_I INC
> -TC_TG_ICC_BV_01_I INC
> -TC_TG_ICC_BV_02_I INC
> +TC_TG_CRC_BV_01_I PASS
> +TC_TG_CRC_BV_02_I PASS Disconnect from PTS
> +TC_TG_ICC_BV_01_I PASS
> +TC_TG_ICC_BV_02_I PASS
> TC_TG_INV_BI_01_C INC
> TC_TG_INV_BI_02_C N/A
> TC_TG_MCN_CB_BI_01_C N/A
Applied, thanks.
--
BR
Szymon Janc
^ permalink raw reply
* Re: [PATCH] android/pts: PTS test results for GAP
From: Szymon Janc @ 2014-01-28 15:57 UTC (permalink / raw)
To: Sebastian Chlad; +Cc: linux-bluetooth
In-Reply-To: <1390913805-7207-1-git-send-email-sebastianx.chlad@intel.com>
Hi Sebastian,
On Tuesday 28 of January 2014 14:56:45 Sebastian Chlad wrote:
> ---
> android/pts-gap.txt | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/android/pts-gap.txt b/android/pts-gap.txt
> index 0ea5539..1c0feec 100644
> --- a/android/pts-gap.txt
> +++ b/android/pts-gap.txt
> @@ -1,7 +1,7 @@
> PTS test results for GAP
>
> -PTS version: 4.9
> -Tested: 14.11.2013
> +PTS version: 5.0
> +Tested: 28.01.2014
>
> Results:
> PASS test passed
> @@ -12,14 +12,14 @@ N/A test is disabled due to PICS setup
> ---------------------------------------------------------------------------
> ---- Test Name Result Notes
> ---------------------------------------------------------------------------
> ---- -TC_MOD_NDIS_BV_01_C PASS
> +TC_MOD_NDIS_BV_01_C PASS IUT must be in non-discoverable mode
> TC_MOD_LDIS_BV_01_C N/A
> TC_MOD_LDIS_BV_02_C N/A
> TC_MOD_LDIS_BV_03_C N/A
> -TC_MOD_GDIS_BV_01_C PASS
> -TC_MOD_GDIS_BV_02_C PASS
> -TC_MOD_NCON_BV_01_C PASS
> -TC_MOD_CON_BV_01_C PASS
> +TC_MOD_GDIS_BV_01_C PASS IUT must be discoverable
> +TC_MOD_GDIS_BV_02_C PASS IUT must be discoverable
> +TC_MOD_NCON_BV_01_C PASS btmgmt connectable off
> +TC_MOD_CON_BV_01_C PASS btmgmt connectable on
> TC_BROB_BCST_BV_01_C N/A
> TC_BROB_BCST_BV_02_C N/A
> TC_BROB_BCST_BV_03_C N/A
> @@ -48,7 +48,7 @@ TC_DISC_GENP_BV_02_C INC LE not supported yet
> TC_DISC_GENP_BV_03_C INC LE not supported yet
> TC_DISC_GENP_BV_04_C INC LE not supported yet
> TC_DISC_GENP_BV_05_C INC LE not supported yet
> -TC_IDLE_GIN_BV_01_C PASS
> +TC_IDLE_GIN_BV_01_C PASS Start inquiry from IUT
> TC_IDLE_LIN_BV_01_C N/A
> TC_IDLE_NAMP_BV_01_C INC LE not supported yet
> TC_IDLE_NAMP_BV_02_C INC LE not supported yet
> @@ -144,7 +144,7 @@ TC_DM_NBON_BV_01_C N/A
> TC_DM_BON_BV_01_C INC LE not supported yet
> TC_DM_GIN_BV_01_C INC LE not supported yet
> TC_DM_LIN_BV_01_C N/A
> -TC_DM_NAD_BV_01_C PASS
> +TC_DM_NAD_BV_01_C PASS Start inquiry from IUT
> TC_DM_NAD_BV_02_C INC LE not supported yet
> TC_DM_LEP_BV_01_C N/A
> TC_DM_LEP_BV_02_C N/A
Applied, thanks.
--
BR
Szymon Janc
^ permalink raw reply
* Re: [PATCH] android/pts: PTS test results for DID
From: Szymon Janc @ 2014-01-28 15:58 UTC (permalink / raw)
To: Sebastian Chlad; +Cc: linux-bluetooth
In-Reply-To: <1390916438-8190-1-git-send-email-sebastianx.chlad@intel.com>
Hi Sebastian,
On Tuesday 28 of January 2014 15:40:38 Sebastian Chlad wrote:
> ---
> android/pts-did.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/android/pts-did.txt b/android/pts-did.txt
> index c44f56c..d764f09 100644
> --- a/android/pts-did.txt
> +++ b/android/pts-did.txt
> @@ -1,7 +1,7 @@
> PTS test results for DID
>
> PTS version: 5.0
> -Tested: 11.12.2013
> +Tested: 28.01.2014
>
> Results:
> PASS test passed
Applied, thanks.
--
BR
Szymon Janc
^ permalink raw reply
* [PATCH BlueZ v3 1/4] android/AVDTP: Make signalling channel priority 6
From: Luiz Augusto von Dentz @ 2014-01-28 17:14 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This makes signalling priority 6 so it can push commands before the
stream channel, without this the stream channel may be schedule
first and cause the signalling commands to timeout while waiting a slot.
---
v2: Return error if writes fails since that probably means the socket has been
disconnected, also makes code setting socket to blocking a bit cleaner.
v3: Remove cast as suggested by Marcel, make code setting stream fd to block a
separate function.
android/avdtp.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/android/avdtp.c b/android/avdtp.c
index 4abcd75..e93ff70 100644
--- a/android/avdtp.c
+++ b/android/avdtp.c
@@ -2056,7 +2056,7 @@ struct avdtp *avdtp_new(int fd, size_t imtu, size_t omtu, uint16_t version)
{
struct avdtp *session;
GIOCondition cond = G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL;
- int new_fd;
+ int new_fd, priority;
new_fd = dup(fd);
if (new_fd < 0) {
@@ -2064,6 +2064,14 @@ struct avdtp *avdtp_new(int fd, size_t imtu, size_t omtu, uint16_t version)
return NULL;
}
+ priority = 6;
+ if (setsockopt(new_fd, SOL_SOCKET, SO_PRIORITY, &priority,
+ sizeof(priority)) < 0) {
+ error("setsockopt(SO_PRIORITY): %s (%d)", strerror(errno),
+ errno);
+ return NULL;
+ }
+
session = g_new0(struct avdtp, 1);
session->io = g_io_channel_unix_new(new_fd);
session->version = version;
--
1.8.4.2
^ permalink raw reply related
* [PATCH BlueZ v3 2/4] android/AVDTP: Make stream channel priority 5
From: Luiz Augusto von Dentz @ 2014-01-28 17:14 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1390929286-30206-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This makes channel priority 5 so it has higher priority than regular
traffic but less than signalling channel.
---
android/avdtp.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/android/avdtp.c b/android/avdtp.c
index e93ff70..1783555 100644
--- a/android/avdtp.c
+++ b/android/avdtp.c
@@ -2832,10 +2832,19 @@ gboolean avdtp_stream_set_transport(struct avdtp_stream *stream, int fd,
size_t imtu, size_t omtu)
{
GIOChannel *io;
+ int priority;
if (stream != stream->session->pending_open)
return FALSE;
+ priority = 5;
+ if (setsockopt(fd, SOL_SOCKET, SO_PRIORITY, &priority,
+ sizeof(priority)) < 0) {
+ error("setsockopt(SO_PRIORITY): %s (%d)", strerror(errno),
+ errno);
+ return FALSE;
+ }
+
io = g_io_channel_unix_new(fd);
handle_transport_connect(stream->session, io, imtu, omtu);
--
1.8.4.2
^ permalink raw reply related
* [PATCH BlueZ v3 3/4] android/hal-audio: Fix not handling EINTR errors
From: Luiz Augusto von Dentz @ 2014-01-28 17:14 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1390929286-30206-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
If the kernel interrupts us while writting just try again.
---
android/hal-audio.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/android/hal-audio.c b/android/hal-audio.c
index 8d737ad..2ca6289 100644
--- a/android/hal-audio.c
+++ b/android/hal-audio.c
@@ -399,7 +399,7 @@ static void sbc_resume(void *codec_data)
sbc_data->frames_sent = 0;
}
-static void write_media_packet(int fd, struct sbc_data *sbc_data,
+static int write_media_packet(int fd, struct sbc_data *sbc_data,
struct media_packet *mp, size_t data_len)
{
struct timespec cur;
@@ -407,10 +407,13 @@ static void write_media_packet(int fd, struct sbc_data *sbc_data,
unsigned expected_frames;
int ret;
- ret = write(fd, mp, sizeof(*mp) + data_len);
- if (ret < 0) {
- int err = errno;
- error("SBC: failed to write data: %d (%s)", err, strerror(err));
+ while (true) {
+ ret = write(fd, mp, sizeof(*mp) + data_len);
+ if (ret >= 0)
+ break;
+
+ if (errno != EINTR)
+ return -errno;
}
sbc_data->frames_sent += mp->payload.frame_count;
@@ -432,6 +435,8 @@ static void write_media_packet(int fd, struct sbc_data *sbc_data,
if (sbc_data->frames_sent >= expected_frames)
usleep(sbc_data->frame_duration *
mp->payload.frame_count);
+
+ return ret;
}
static ssize_t sbc_write_data(void *codec_data, const void *buffer,
@@ -474,7 +479,9 @@ static ssize_t sbc_write_data(void *codec_data, const void *buffer,
*/
if (mp->payload.frame_count == sbc_data->frames_per_packet ||
bytes == consumed) {
- write_media_packet(fd, sbc_data, mp, encoded);
+ ret = write_media_packet(fd, sbc_data, mp, encoded);
+ if (ret < 0)
+ return ret;
encoded = 0;
free_space = sbc_data->out_buf_size - sizeof(*mp);
--
1.8.4.2
^ permalink raw reply related
* [PATCH BlueZ v3 4/4] android/hal-audio: Set stream fd to blocking
From: Luiz Augusto von Dentz @ 2014-01-28 17:14 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1390929286-30206-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This makes the stream to block on io operation so it does not return
EAGAIN on syscall such as write.
---
android/hal-audio.c | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/android/hal-audio.c b/android/hal-audio.c
index 2ca6289..b1323b0 100644
--- a/android/hal-audio.c
+++ b/android/hal-audio.c
@@ -25,6 +25,7 @@
#include <sys/un.h>
#include <unistd.h>
#include <arpa/inet.h>
+#include <fcntl.h>
#include <hardware/audio.h>
#include <hardware/hardware.h>
@@ -1108,6 +1109,24 @@ static int in_remove_audio_effect(const struct audio_stream *stream,
return -ENOSYS;
}
+static int set_blocking(int fd)
+{
+ int flags;
+
+ flags = fcntl(fd, F_GETFL, 0);
+ if (flags < 0) {
+ error("fcntl(F_GETFL): %s (%d)", strerror(errno), errno);
+ return -errno;
+ }
+
+ if (fcntl(fd, F_SETFL, flags & ~O_NONBLOCK) < 0) {
+ error("fcntl(F_SETFL): %s (%d)", strerror(errno), errno);
+ return -errno;
+ }
+
+ return 0;
+}
+
static int audio_open_output_stream(struct audio_hw_device *dev,
audio_io_handle_t handle,
audio_devices_t devices,
@@ -1156,8 +1175,10 @@ static int audio_open_output_stream(struct audio_hw_device *dev,
if (!preset || fd < 0)
goto fail;
- out->ep->fd = fd;
+ if (set_blocking(fd) < 0)
+ goto fail;
+ out->ep->fd = fd;
codec = out->ep->codec;
codec->init(preset, mtu, &out->ep->codec_data);
--
1.8.4.2
^ permalink raw reply related
* [PATCH] android/pts: PTS test results for PBAP
From: Sebastian Chlad @ 2014-01-28 17:25 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Sebastian Chlad
---
android/pts-pbap.txt | 103 +++++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 88 insertions(+), 15 deletions(-)
diff --git a/android/pts-pbap.txt b/android/pts-pbap.txt
index 843b7cf..4312921 100644
--- a/android/pts-pbap.txt
+++ b/android/pts-pbap.txt
@@ -1,7 +1,7 @@
PTS test results for PBAP
PTS version: 5.0
-Tested: 14.11.2013
+Tested: 28.01.2014
Results:
PASS test passed
@@ -17,32 +17,82 @@ TC_PCE_SSM_BV_02_C N/A
TC_PCE_SSM_BV_06_C N/A
TC_PCE_SSM_BV_08_C N/A
TC_PCE_SSM_BI_01_C N/A
+TC_PCE_SSM_BV_09_C N/A
+TC_PCE_SSM_BV_10_C N/A
TC_PCE_PBD_BV_01_C N/A
TC_PCE_PBD_BV_04_C N/A
+TC_PCE_PBD_BV_38_C N/A
+TC_PCE_PBD_BV_29_C N/A
+TC_PCE_PBD_BV_40_C N/A
+TC_PCE_PBD_BV_41_C N/A
+TC_PCE_PBD_BV_42_C N/A
+TC_PCE_PBD_BV_43_C N/A
+TC_PCE_PBD_BV_44_C N/A
+TC_PCE_PBD_BV_45_C N/A
+TC_PCE_PBD_BV_46_C N/A
+TC_PCE_PBD_BV_47_C N/A
+TC_PCE_PBD_BV_48_C N/A
TC_PCE_PBB_BV_01_C N/A
TC_PCE_PBB_BV_02_C N/A
TC_PCE_PBB_BV_03_C N/A
TC_PCE_PBB_BV_05_C N/A
+TC_PCE_PBB_BV_39_C N/A
+TC_PCE_PBB_BV_40_C N/A
+TC_PCE_PBB_BV_41_C N/A
+TC_PCE_PBB_BV_42_C N/A
+TC_PCE_PBB_BV_33_C N/A
+TC_PCE_PBB_BV_34_C N/A
+TC_PCE_PBB_BV_35_C N/A
+TC_PCE_PBB_BV_36_C N/A
+TC_PCE_PBB_BV_43_C N/A
+TC_PCE_PBB_BV_37_C N/A
+TC_PCE_PBB_BV_38_C N/A
TC_PCE_PBF_BV_01_I N/A
TC_PCE_PBF_BV_02_I N/A
+TC_PCE_PBF_BV_03_I N/A
TC_PCE_PDF_BV_01_I N/A
-TC_PCE_PDF_BV_04_I N/A
+TC_PCE_PDF_BV_06_I N/A
TC_PSE_SSM_BV_03_C PASS
TC_PSE_SSM_BV_05_C PASS
-TC_PSE_SSM_BV_07_C PASS
+TC_PSE_SSM_BV_07_C PASS Tester must accept obex request with
+ TSPX_auth_password set in PIXITs
TC_PSE_SSM_BI_02_C PASS
TC_PSE_SSM_BI_03_C N/A
-TC_PSE_SSM_BV_08_I PASS
-TC_PSE_PBD_BV_02_C PASS
-TC_PSE_PBD_BV_03_C PASS
+TC_PSE_SSM_BV_08_I PASS Tester must compare passkey on IUT and PTS
+TC_PSE_SSM_BV_11_C N/A
+
+TC_PSE_PBD_BV_02_C PASS Tester must compare phone book size with the value
+ given by PTS
+TC_PSE_PBD_BV_03_C PASS Tester must compare phone book size with the value
+ given by PTS
TC_PSE_PBD_BV_05_C N/A
TC_PSE_PBD_BI_01_C FAIL
-TC_PSE_PBD_BV_11_C N/A
-TC_PSE_PBD_BV_12_C N/A
-TC_PSE_PBD_BV_13_C N/A
-TC_PSE_PBD_BV_14_C N/A
-TC_PSE_PBD_BV_15_C N/A
-TC_PSE_PBD_BV_16_C N/A
+TC_PSE_PBD_BV_06_C N/A
+TC_PSE_PBD_BV_07_C N/A
+TC_PSE_PBD_BV_08_C N/A
+TC_PSE_PBD_BV_09_C N/A
+TC_PSE_PBD_BV_10_C N/A
+TC_PSE_PBD_BV_17_C FAIL
+TC_PSE_PBD_BV_18_C N/A
+TC_PSE_PBD_BV_19_C N/A
+TC_PSE_PBD_BV_20_C N/A
+TC_PSE_PBD_BV_21_C N/A
+TC_PSE_PBD_BV_22_C N/A
+TC_PSE_PBD_BV_23_C N/A
+TC_PSE_PBD_BV_24_C N/A
+TC_PSE_PBD_BV_25_C N/A
+TC_PSE_PBD_BV_26_C N/A
+TC_PSE_PBD_BV_27_C N/A
+TC_PSE_PBD_BV_28_C N/A
+TC_PSE_PBD_BV_29_C N/A
+TC_PSE_PBD_BV_30_C N/A
+TC_PSE_PBD_BV_31_C N/A
+TC_PSE_PBD_BV_32_C N/A
+TC_PSE_PBD_BV_33_C N/A
+TC_PSE_PBD_BV_34_C N/A
+TC_PSE_PBD_BV_35_C N/A
+TC_PSE_PBD_BV_36_C PASS
+TC_PSE_PBD_BV_37_C N/A
TC_PSE_PBB_BV_06_C PASS
TC_PSE_PBB_BV_07_C PASS
TC_PSE_PBB_BV_08_C PASS
@@ -51,9 +101,32 @@ TC_PSE_PBB_BV_10_C PASS
TC_PSE_PBB_BV_11_C PASS
TC_PSE_PBB_BI_01_C PASS
TC_PSE_PBB_BI_07_C PASS
+TC_PSE_PBB_BV_12_C PASS
+TC_PSE_PBB_BV_13_C N/A
+TC_PSE_PBB_BV_14_C N/A
+TC_PSE_PBB_BV_15_C N/A
+TC_PSE_PBB_BV_16_C N/A
+TC_PSE_PBB_BV_17_C N/A
+TC_PSE_PBB_BV_18_C N/A
+TC_PSE_PBB_BV_19_C N/A
+TC_PSE_PBB_BV_20_C N/A
+TC_PSE_PBB_BV_21_C N/A
+TC_PSE_PBB_BV_22_C N/A
+TC_PSE_PBB_BV_23_C N/A
+TC_PSE_PBB_BV_24_C N/A
+TC_PSE_PBB_BV_25_C N/A
+TC_PSE_PBB_BV_26_C N/A
+TC_PSE_PBB_BV_27_C N/A
+TC_PSE_PBB_BV_44_C N/A
+TC_PSE_PBB_BV_45_C N/A
+TC_PSE_PBB_BV_46_C N/A
+TC_PSE_PBB_BV_28_C N/A
+TC_PSE_PBB_BV_29_C N/A
+TC_PSE_PBB_BV_30_C N/A
+TC_PSE_PBB_BV_31_C PASS
+TC_PSE_PBB_BV_32_C N/A
TC_PSE_PBF_BV_01_I PASS
TC_PSE_PBF_BV_02_I PASS
-TC_PSE_PDF_BV_01_I PASS
-TC_PSE_PDF_BV_03_I N/A
-TC_PSE_PDF_BV_05_I N/A
+TC_PSE_PDF_BV_01_I PASS Tester must compare phone book size with the value
+ given by PTS
-------------------------------------------------------------------------------
--
1.8.3.2
---------------------------------------------------------------------
Intel Finland Oy
Registered Address: PL 281, 00181 Helsinki
Business Identity Code: 0357606 - 4
Domiciled in Helsinki
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
^ permalink raw reply related
* [PATCH] android/pts: PTS test results for OPP
From: Sebastian Chlad @ 2014-01-28 17:59 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Sebastian Chlad
---
android/pts-opp.txt | 37 ++++++++++++++++++++-----------------
1 file changed, 20 insertions(+), 17 deletions(-)
diff --git a/android/pts-opp.txt b/android/pts-opp.txt
index b9329b9..3c4ab47 100644
--- a/android/pts-opp.txt
+++ b/android/pts-opp.txt
@@ -1,7 +1,7 @@
PTS test results for OPP
-PTS version: 4.9
-Tested: 14.11.2013
+PTS version: 5.0
+Tested: 28.01.2014
Results:
PASS test passed
@@ -14,9 +14,9 @@ Test Name Result Notes
-------------------------------------------------------------------------------
TC_CLIENT_OPH_BV_01_I PASS
TC_CLIENT_OPH_BV_02_I N/A
-TC_CLIENT_OPH_BV_03_I PASS
+TC_CLIENT_OPH_BV_03_I PASS Tester must send a contact to PTS
TC_CLIENT_OPH_BV_04_I N/A
-TC_CLIENT_OPH_BV_05_I PASS
+TC_CLIENT_OPH_BV_05_I PASS Tester must send a contact to PTS
TC_CLIENT_OPH_BV_07_I N/A
TC_CLIENT_OPH_BV_08_I N/A
TC_CLIENT_OPH_BV_09_I N/A
@@ -49,33 +49,36 @@ TC_CLIENT_BCE_BV_04_I N/A
TC_CLIENT_BCE_BV_05_I N/A
TC_CLIENT_BCE_BV_06_I N/A
TC_CLIENT_BCE_BV_07_I N/A
-TC_SERVER_OPH_BV_01_I PASS
-TC_SERVER_OPH_BV_02_I PASS
-TC_SERVER_OPH_BV_03_I PASS
-TC_SERVER_OPH_BV_04_I PASS
-TC_SERVER_OPH_BV_05_I PASS
+TC_SERVER_OPH_BV_01_I PASS IUT must be in the connectable mode
+TC_SERVER_OPH_BV_02_I PASS IUT must be in the connectable mode
+TC_SERVER_OPH_BV_03_I PASS IUT must be in the connectable mode. Tester must
+ accept incoming file
+TC_SERVER_OPH_BV_04_I PASS IUT must be in the connectable mode. Tester must
+ accept incoming file
+TC_SERVER_OPH_BV_05_I PASS IUT must be in the connectable mode. Tester must
+ reject incoming file
TC_SERVER_OPH_BV_07_I N/A
TC_SERVER_OPH_BV_08_I N/A
TC_SERVER_OPH_BV_09_I N/A
-TC_SERVER_OPH_BV_10_I PASS
+TC_SERVER_OPH_BV_10_I PASS IUT must be in the connectable mode
TC_SERVER_OPH_BV_11_I N/A
TC_SERVER_OPH_BV_12_I N/A
TC_SERVER_OPH_BV_13_I N/A
-TC_SERVER_OPH_BV_14_I PASS
+TC_SERVER_OPH_BV_14_I PASS IUT must be in the connectable mode
TC_SERVER_OPH_BV_15_I N/A
TC_SERVER_OPH_BV_16_I N/A
TC_SERVER_OPH_BV_17_I N/A
-TC_SERVER_OPH_BV_18_I PASS
-TC_SERVER_OPH_BV_19_I PASS
+TC_SERVER_OPH_BV_18_I PASS IUT must be in the connectable mode
+TC_SERVER_OPH_BV_19_I PASS IUT must be in the connectable mode
TC_SERVER_OPH_BV_21_I N/A
-TC_SERVER_OPH_BV_22_I PASS
-TC_SERVER_OPH_BV_23_I PASS
+TC_SERVER_OPH_BV_22_I PASS IUT must be in the connectable mode
+TC_SERVER_OPH_BV_23_I PASS IUT must be in the connectable mode
TC_SERVER_OPH_BV_24_I N/A
TC_SERVER_OPH_BV_25_I N/A
TC_SERVER_OPH_BV_26_I N/A
-TC_SERVER_OPH_BV_34_I PASS
+TC_SERVER_OPH_BV_34_I PASS IUT must be in the connectable mode
TC_SERVER_BCP_BV_01_I N/A
-TC_SERVER_BCP_BV_02_I PASS
+TC_SERVER_BCP_BV_02_I PASS IUT must be in the connectable mode
TC_SERVER_BCP_BV_03_I N/A
TC_SERVER_BCP_BV_04_I N/A
TC_SERVER_BCP_BV_05_I N/A
--
1.8.3.2
---------------------------------------------------------------------
Intel Finland Oy
Registered Address: PL 281, 00181 Helsinki
Business Identity Code: 0357606 - 4
Domiciled in Helsinki
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
^ permalink raw reply related
* [PATCH BlueZ] audio/AVRCP: Fix sending invalid response to GetCapabilities
From: Luiz Augusto von Dentz @ 2014-01-28 20:05 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
The attribute count has to be initialized with 0 since we reuse the same
buffer for both command and responses it may be already be set causing
invalid response to be generated.
---
profiles/audio/avrcp.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
index 59a966e..ad5dc34 100644
--- a/profiles/audio/avrcp.c
+++ b/profiles/audio/avrcp.c
@@ -921,6 +921,7 @@ static uint8_t avrcp_handle_get_capabilities(struct avrcp *session,
return AVC_CTYPE_STABLE;
case CAP_EVENTS_SUPPORTED:
+ pdu->params[1] = 0;
for (i = 1; i <= AVRCP_EVENT_LAST; i++) {
if (session->supported_events & (1 << i)) {
pdu->params[1]++;
--
1.8.4.2
^ permalink raw reply related
* Re: [PATCH] Bluetooth: hidp: make sure input buffers are big enough
From: Jiri Kosina @ 2014-01-28 20:53 UTC (permalink / raw)
To: David Herrmann
Cc: Marcel Holtmann, open list:HID CORE LAYER,
linux-bluetooth@vger.kernel.org development, Gustavo F. Padovan
In-Reply-To: <alpine.LNX.2.00.1401071811530.4962@pobox.suse.cz>
On Tue, 7 Jan 2014, Jiri Kosina wrote:
> > > So doing kzalloc(rsize, GFP_ATOMIC) in the HID-core for now, and copying
> > > the buffer around, seems like only viable solution for now, with the
> > > outlook of removing this ugliness once hid-core honors 'size' properly.
> >
> > Should I resend the patches and move it to hid_input_report() for now?
> > Or are you getting something in yourself?
>
> Due to various reasons I will not have access to any testing HW for the
> upcoming 2-3 days, so if you can cook something up in that timeframe, it'd
> be appreciated.
>
> Otherwise I'll be working on it by the end of this week.
David,
just got back to this, finally ... did you have time to work on this at
all, or should I just start from scratch?
> > Given the amount of reports on the list and bugzilla, I think we should
> > get this fix in asap. We can always fix it properly in -next.
>
> Agreed.
--
Jiri Kosina
SUSE Labs
^ permalink raw reply
* [PATCH] Bluetooth: Fix consistency of local vs remote PSM reporting
From: johan.hedberg @ 2014-01-28 22:13 UTC (permalink / raw)
To: linux-bluetooth
From: Johan Hedberg <johan.hedberg@intel.com>
When we're the initiators of a connection the PSM resides on the remote
side and when we're acceptors on the local side. Since the PSM isn't
defined for the initiating side for all practical purposes it should
have the value 0 if requested by user space.
The l2cap_chan structure contains two values for a PSM, psm and sport,
which are used to return the value for getsockname() and getpeername().
However, the values returned haven't really been consistent. When we
initiate an outgoing connection the sport value should be set to 0, and
when we receive an incoming connect request the sport of the newly
created l2cap_chan should reflect the targetted PSM.
It's important the chan->psm has always a valid value since there are
several code paths that rely on it being set regardless of acceptor or
initiator use cases.
This patch updates the relevant outgoing and incoming connection paths
to ensure that the psm and sport l2cap_chan members have the appropriate
values in all cases.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
net/bluetooth/l2cap_core.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index d2ef49b54aa2..a5519a8dcb65 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -3774,7 +3774,8 @@ static struct l2cap_chan *l2cap_connect(struct l2cap_conn *conn,
bacpy(&chan->dst, &conn->hcon->dst);
chan->src_type = bdaddr_type(conn->hcon, conn->hcon->src_type);
chan->dst_type = bdaddr_type(conn->hcon, conn->hcon->dst_type);
- chan->psm = psm;
+ chan->psm = psm;
+ chan->sport = psm;
chan->dcid = scid;
chan->local_amp_id = amp_id;
@@ -5421,7 +5422,8 @@ static int l2cap_le_connect_req(struct l2cap_conn *conn,
bacpy(&chan->dst, &conn->hcon->dst);
chan->src_type = bdaddr_type(conn->hcon, conn->hcon->src_type);
chan->dst_type = bdaddr_type(conn->hcon, conn->hcon->dst_type);
- chan->psm = psm;
+ chan->psm = psm;
+ chan->sport = psm;
chan->dcid = scid;
chan->omtu = mtu;
chan->remote_mps = mps;
@@ -7083,6 +7085,7 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
chan->dst_type = dst_type;
chan->psm = psm;
+ chan->sport = 0;
chan->dcid = cid;
auth_type = l2cap_get_auth_type(chan);
--
1.8.5.3
^ permalink raw reply related
* [PATCH 1/4] Bluetooth: Free up l2cap_chan->sport when initiating a connection
From: johan.hedberg @ 2014-01-28 23:16 UTC (permalink / raw)
To: linux-bluetooth
From: Johan Hedberg <johan.hedberg@intel.com>
The sport variable is used to track the allocation of the local PSM
database to ensure no two sockets take the same local PSM. It is
acquired upon bind() but needs to be freed up if the socket ends up
becoming a client one. This patch adds the clearing of the value when
l2cap_chan_connect is called.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
net/bluetooth/l2cap_core.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index d2ef49b54aa2..f583988a4653 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -7126,6 +7126,13 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
l2cap_state_change(chan, BT_CONNECT);
__set_chan_timer(chan, chan->ops->get_sndtimeo(chan));
+ /* Release chan->sport so that it can be reused by other
+ * sockets (as it's only used for listening sockets).
+ */
+ write_lock(&chan_list_lock);
+ chan->sport = 0;
+ write_unlock(&chan_list_lock);
+
if (hcon->state == BT_CONNECTED) {
if (chan->chan_type != L2CAP_CHAN_CONN_ORIENTED) {
__clear_chan_timer(chan);
--
1.8.5.3
^ permalink raw reply related
* [PATCH 2/4] Bluetooth: Refuse peer L2CAP address reading when not connected
From: johan.hedberg @ 2014-01-28 23:16 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1390951011-30576-1-git-send-email-johan.hedberg@gmail.com>
From: Johan Hedberg <johan.hedberg@intel.com>
When we're not connected the peer address information is undefined. This
patch fixes the remote address getting to return a proper error in case
the state is anything else than BT_CONNECTED.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
net/bluetooth/l2cap_sock.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 304fc8589af4..a0b8c7aa448e 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -366,6 +366,9 @@ static int l2cap_sock_getname(struct socket *sock, struct sockaddr *addr,
BT_DBG("sock %p, sk %p", sock, sk);
+ if (peer && sk->sk_state != BT_CONNECTED)
+ return -ENOTCONN;
+
memset(la, 0, sizeof(struct sockaddr_l2));
addr->sa_family = AF_BLUETOOTH;
*len = sizeof(struct sockaddr_l2);
--
1.8.5.3
^ permalink raw reply related
* [PATCH 3/4] Bluetooth: Refuse peer RFCOMM address reading when not connected
From: johan.hedberg @ 2014-01-28 23:16 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1390951011-30576-1-git-send-email-johan.hedberg@gmail.com>
From: Johan Hedberg <johan.hedberg@intel.com>
When we're not connected the peer address information is undefined. This
patch fixes the remote address getting to return a proper error in case
the sate is anything else than BT_CONNECTED.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
net/bluetooth/rfcomm/sock.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
index fb8158af1f39..00573fb79030 100644
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -528,6 +528,9 @@ static int rfcomm_sock_getname(struct socket *sock, struct sockaddr *addr, int *
BT_DBG("sock %p, sk %p", sock, sk);
+ if (peer && sk->sk_state != BT_CONNECTED)
+ return -ENOTCONN;
+
memset(sa, 0, sizeof(*sa));
sa->rc_family = AF_BLUETOOTH;
sa->rc_channel = rfcomm_pi(sk)->channel;
--
1.8.5.3
^ permalink raw reply related
* [PATCH 4/4] Bluetooth: Always use l2cap_chan->psm for returning PSM to user space
From: johan.hedberg @ 2014-01-28 23:16 UTC (permalink / raw)
To: linux-bluetooth
In-Reply-To: <1390951011-30576-1-git-send-email-johan.hedberg@gmail.com>
From: Johan Hedberg <johan.hedberg@intel.com>
The l2cap_chan->psm value is always set to a valid value for a
connection oriented channel. The l2cap_chan->sport is used for tracking
local PSM allocations but will not always have a proper value, such as
with connected sockets derived from a listening socket. This patch fixes
the sock_getname callback to always use chan->psm when returning address
information.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
net/bluetooth/l2cap_sock.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index a0b8c7aa448e..6ca14c411b89 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -373,13 +373,13 @@ static int l2cap_sock_getname(struct socket *sock, struct sockaddr *addr,
addr->sa_family = AF_BLUETOOTH;
*len = sizeof(struct sockaddr_l2);
+ la->l2_psm = chan->psm;
+
if (peer) {
- la->l2_psm = chan->psm;
bacpy(&la->l2_bdaddr, &chan->dst);
la->l2_cid = cpu_to_le16(chan->dcid);
la->l2_bdaddr_type = chan->dst_type;
} else {
- la->l2_psm = chan->sport;
bacpy(&la->l2_bdaddr, &chan->src);
la->l2_cid = cpu_to_le16(chan->scid);
la->l2_bdaddr_type = chan->src_type;
--
1.8.5.3
^ permalink raw reply related
* [PATCH] Bluetooth: Remove unnecessary check for chan->psm
From: johan.hedberg @ 2014-01-28 23:28 UTC (permalink / raw)
To: linux-bluetooth
From: Johan Hedberg <johan.hedberg@intel.com>
Now that ATT sockets have been converted to use the new L2CAP_CHAN_FIXED
type there is no need to have an extra check for chan->psm in the
l2cap_chan_close function.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
---
net/bluetooth/l2cap_core.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index f583988a4653..66fbac91eaed 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -666,10 +666,7 @@ void l2cap_chan_close(struct l2cap_chan *chan, int reason)
case BT_CONNECTED:
case BT_CONFIG:
- /* ATT uses L2CAP_CHAN_CONN_ORIENTED so we must also
- * check for chan->psm.
- */
- if (chan->chan_type == L2CAP_CHAN_CONN_ORIENTED && chan->psm) {
+ if (chan->chan_type == L2CAP_CHAN_CONN_ORIENTED) {
__set_chan_timer(chan, chan->ops->get_sndtimeo(chan));
l2cap_send_disconn_req(chan, reason);
} else
--
1.8.5.3
^ permalink raw reply related
* Re: [PATCH 1/4] Bluetooth: Free up l2cap_chan->sport when initiating a connection
From: Marcel Holtmann @ 2014-01-28 23:28 UTC (permalink / raw)
To: Johan Hedberg; +Cc: BlueZ development
In-Reply-To: <1390951011-30576-1-git-send-email-johan.hedberg@gmail.com>
Hi Johan,
> The sport variable is used to track the allocation of the local PSM
> database to ensure no two sockets take the same local PSM. It is
> acquired upon bind() but needs to be freed up if the socket ends up
> becoming a client one. This patch adds the clearing of the value when
> l2cap_chan_connect is called.
>
> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
> ---
> net/bluetooth/l2cap_core.c | 7 +++++++
> 1 file changed, 7 insertions(+)
patch has been applied to bluetooth-next tree.
Regards
Marcel
^ permalink raw reply
* Re: [PATCH 2/4] Bluetooth: Refuse peer L2CAP address reading when not connected
From: Marcel Holtmann @ 2014-01-28 23:29 UTC (permalink / raw)
To: Johan Hedberg; +Cc: BlueZ development
In-Reply-To: <1390951011-30576-2-git-send-email-johan.hedberg@gmail.com>
Hi Johan,
> When we're not connected the peer address information is undefined. This
> patch fixes the remote address getting to return a proper error in case
> the state is anything else than BT_CONNECTED.
>
> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
> ---
> net/bluetooth/l2cap_sock.c | 3 +++
> 1 file changed, 3 insertions(+)
patch has been applied to bluetooth-next tree.
Regards
Marcel
^ permalink raw reply
* Re: [PATCH 3/4] Bluetooth: Refuse peer RFCOMM address reading when not connected
From: Marcel Holtmann @ 2014-01-28 23:31 UTC (permalink / raw)
To: Johan Hedberg; +Cc: BlueZ development
In-Reply-To: <1390951011-30576-3-git-send-email-johan.hedberg@gmail.com>
Hi Johan,
> When we're not connected the peer address information is undefined. This
> patch fixes the remote address getting to return a proper error in case
> the sate is anything else than BT_CONNECTED.
>
> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
> ---
> net/bluetooth/rfcomm/sock.c | 3 +++
> 1 file changed, 3 insertions(+)
patch has been applied to bluetooth-next tree.
Regards
Marcel
^ permalink raw reply
* Re: [PATCH BlueZ v3 1/4] android/AVDTP: Make signalling channel priority 6
From: Szymon Janc @ 2014-01-28 23:33 UTC (permalink / raw)
To: Luiz Augusto von Dentz; +Cc: linux-bluetooth
In-Reply-To: <1390929286-30206-1-git-send-email-luiz.dentz@gmail.com>
Hi Luiz,
On Tuesday 28 of January 2014 09:14:43 Luiz Augusto von Dentz wrote:
> From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
>
> This makes signalling priority 6 so it can push commands before the
> stream channel, without this the stream channel may be schedule
> first and cause the signalling commands to timeout while waiting a slot.
> ---
> v2: Return error if writes fails since that probably means the socket has
> been disconnected, also makes code setting socket to blocking a bit
> cleaner. v3: Remove cast as suggested by Marcel, make code setting stream
> fd to block a separate function.
>
> android/avdtp.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/android/avdtp.c b/android/avdtp.c
> index 4abcd75..e93ff70 100644
> --- a/android/avdtp.c
> +++ b/android/avdtp.c
> @@ -2056,7 +2056,7 @@ struct avdtp *avdtp_new(int fd, size_t imtu, size_t
> omtu, uint16_t version) {
> struct avdtp *session;
> GIOCondition cond = G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL;
> - int new_fd;
> + int new_fd, priority;
>
> new_fd = dup(fd);
> if (new_fd < 0) {
> @@ -2064,6 +2064,14 @@ struct avdtp *avdtp_new(int fd, size_t imtu, size_t
> omtu, uint16_t version) return NULL;
> }
>
> + priority = 6;
> + if (setsockopt(new_fd, SOL_SOCKET, SO_PRIORITY, &priority,
> + sizeof(priority)) < 0) {
> + error("setsockopt(SO_PRIORITY): %s (%d)", strerror(errno),
> + errno);
> + return NULL;
> + }
> +
> session = g_new0(struct avdtp, 1);
> session->io = g_io_channel_unix_new(new_fd);
> session->version = version;
All four patches applied, thanks.
--
BR
Szymon Janc
^ permalink raw reply
* Re: [PATCH 4/4] Bluetooth: Always use l2cap_chan->psm for returning PSM to user space
From: Marcel Holtmann @ 2014-01-28 23:33 UTC (permalink / raw)
To: Johan Hedberg; +Cc: BlueZ development
In-Reply-To: <1390951011-30576-4-git-send-email-johan.hedberg@gmail.com>
Hi Johan,
> The l2cap_chan->psm value is always set to a valid value for a
> connection oriented channel. The l2cap_chan->sport is used for tracking
> local PSM allocations but will not always have a proper value, such as
> with connected sockets derived from a listening socket. This patch fixes
> the sock_getname callback to always use chan->psm when returning address
> information.
>
> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
> ---
> net/bluetooth/l2cap_sock.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel
^ permalink raw reply
* Re: [PATCH] Bluetooth: Remove unnecessary check for chan->psm
From: Marcel Holtmann @ 2014-01-28 23:35 UTC (permalink / raw)
To: Johan Hedberg; +Cc: BlueZ development
In-Reply-To: <1390951684-3225-1-git-send-email-johan.hedberg@gmail.com>
Hi Johan,
> Now that ATT sockets have been converted to use the new L2CAP_CHAN_FIXED
> type there is no need to have an extra check for chan->psm in the
> l2cap_chan_close function.
>
> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
> ---
> net/bluetooth/l2cap_core.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel
^ permalink raw reply
* [PATCH] Bluetooth: Increment management interface revision
From: Marcel Holtmann @ 2014-01-28 23:39 UTC (permalink / raw)
To: linux-bluetooth
This patch increments the management interface revision due to the
various fixes, improvements and other changes that have been made.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
---
net/bluetooth/mgmt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 4ee07b432379..bde8e675c5ea 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -34,7 +34,7 @@
#include "smp.h"
#define MGMT_VERSION 1
-#define MGMT_REVISION 4
+#define MGMT_REVISION 5
static const u16 mgmt_commands[] = {
MGMT_OP_READ_INDEX_LIST,
--
1.8.5.3
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox