Changeset f9841e69 in mainline for kernel/generic/src/ipc/ipc.c

Timestamp:

2012-09-02T21:52:11Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9ef1b79b

Parents:

fcfa926b

Message:

Call answer_preprocess() also when ipc_forward() returns error.

File:

• kernel/generic/src/ipc/ipc.c (modified) (2 diffs)

kernel/generic/src/ipc/ipc.c

@@ -171 +171 @@
  *
  */
-static void _ipc_answer_free_call(call_t *call, bool selflocked)
+void _ipc_answer_free_call(call_t *call, bool selflocked)
 {
         /* Count sent answer */
@@ -306 +306 @@
         if (phone->state != IPC_PHONE_CONNECTED) {
                 mutex_unlock(&phone->lock);
-                if (call->flags & IPC_CALL_FORWARDED) {
-                        IPC_SET_RETVAL(call->data, EFORWARD);
-                        _ipc_answer_free_call(call, false);
-                } else {
+                if (!(call->flags & IPC_CALL_FORWARDED)) {
                         if (phone->state == IPC_PHONE_HUNGUP)
                                 ipc_backsend_err(phone, call, EHANGUP);