From: Corey Farrell <git@cfware.com>
Date: Fri, 8 Dec 2017 01:33:27 +0000 (-0500)
Subject: res_stasis and res_speech: Fix load order.
X-Git-Tag: 15.2.0-rc1~56^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=95a90bdca1c9e9f5af8bba9d55e55749d44aae98;p=thirdparty%2Fasterisk.git

res_stasis and res_speech: Fix load order.

res_stasis was missing AST_MODFLAG_LOAD_ORDER.  Set res_stasis and
res_speech to start at (AST_MODPRI_APP_DEPEND - 1) so they are ready for
dependent modules.

Change-Id: I27f4f3810a95b6be8a5bfbf62be2ace6bfab6ff3
---

diff --git a/res/res_speech.c b/res/res_speech.c
index d6c5329714..31ad61acb4 100644
--- a/res/res_speech.c
+++ b/res/res_speech.c
@@ -363,5 +363,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_
 	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
-	.load_pri = AST_MODPRI_APP_DEPEND,
+	.load_pri = AST_MODPRI_APP_DEPEND - 1,
 );
diff --git a/res/res_stasis.c b/res/res_stasis.c
index f99dcee372..42a19bf560 100644
--- a/res/res_stasis.c
+++ b/res/res_stasis.c
@@ -2155,8 +2155,8 @@ static int load_module(void)
 	return AST_MODULE_LOAD_SUCCESS;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis application support",
-	.load_pri = AST_MODPRI_APP_DEPEND,
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_ORDER, "Stasis application support",
+	.load_pri = AST_MODPRI_APP_DEPEND - 1,
 	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,