commit c7a6056e3ac5111238ed1061d0c2a18f3febcd53
author Chia-chi Yeh <chiachi@android.com> Fri May 04 09:19:18 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri May 04 09:19:18 2012 -0700
tree 8052be9310d1e24ea58d416969496fe5a385de45
parent fba8fdc6c588873aa944d7aa79b2f12ade78566a
parent 15b085f8d06b2b579e0cf30f8a57f9d15d50f2b9

am 15b085f8: Merge "Fix issue that VPN connection fail when L2TP secret enable"

* commit '15b085f8d06b2b579e0cf30f8a57f9d15d50f2b9':
  Fix issue that VPN connection fail when L2TP secret enable

l2tp.c

diff --git a/l2tp.c b/l2tp.c
index 8a58b1a..47d33ce 100644
--- a/l2tp.c
+++ b/l2tp.c
@@ -429,8 +429,8 @@
                     log_print(DEBUG, "Received SCCRP (remote_tunnel = %d) -> "
                             "Sending SCCCN", remote_tunnel);
                     state = SCCCN;
-                    answer_challenge();
                     set_message(0, SCCCN);
+                    answer_challenge();
                     break;
                 }
                 log_print(DEBUG, "Received SCCRP without %s", tunnel ?