summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2008-10-19 19:54:48 +0300
committerJohan Hedberg <johan.hedberg@nokia.com>2008-10-19 19:54:48 +0300
commita1ac214c97e81fefc4393fdfea0e5c9041f75bdd (patch)
tree698358d0b5929bb174ad87e7829bf31fde3fe428
parent9ca31c446e4e3de7ff581519386c4cb6e26c9db0 (diff)
Remove OPEN state change from avdtp_open_cmd
Some time back the INT role OPEN transition was moved from receiving the OPEN response to actually having the stream L2CAP channel ready. Unfortunatly this patch forgot to change the ACP case so the code has so far attempted a double ->OPEN transition. According to the AVDTP spec the transition should happen before the stream L2CAP transport but this doesn't really make sense since several places want to have the stream fd ready when we go to the OPEN state. Therefore, this patch removes the ACP role OPEN transition from receiving the OPEN command and lets the state change be in having the stream L2CAP transport established.
-rw-r--r--audio/avdtp.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/audio/avdtp.c b/audio/avdtp.c
index affc7fe7..361c5eee 100644
--- a/audio/avdtp.c
+++ b/audio/avdtp.c
@@ -1171,7 +1171,6 @@ static gboolean avdtp_open_cmd(struct avdtp *session, struct seid_req *req,
stream->open_acp = TRUE;
session->pending_open = stream;
- avdtp_sep_set_state(session, sep, AVDTP_STATE_OPEN);
stream->timer = g_timeout_add(REQ_TIMEOUT, stream_open_timeout,
stream);