summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2016-08-26 14:03:10 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2016-08-26 14:03:10 -0500
commit4a8bdfc49b1c9c48536aafbb008b8c0dbddaf8c1 (patch)
tree0094311d3efeb5da94321212199a2694ba1fba2f /include
parent179e8c15c8198983710d34d8416c4d9f62afb29c (diff)
parent5eb6cb969f440200835a6e818a4f69f7a77f280f (diff)
Merge "res_fax: Fix deadlock in ast_channel_get_t38_state()."
Diffstat (limited to 'include')
-rw-r--r--include/asterisk/channel.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 14bd32c07..3293dd77b 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -2549,7 +2549,11 @@ static inline int ast_fdisset(struct pollfd *pfds, int fd, int maximum, int *sta
return 0;
}
-/*! \brief Retrieves the current T38 state of a channel */
+/*!
+ * \brief Retrieves the current T38 state of a channel
+ *
+ * \note Absolutely _NO_ channel locks should be held before calling this function.
+ */
static inline enum ast_t38_state ast_channel_get_t38_state(struct ast_channel *chan)
{
enum ast_t38_state state = T38_STATE_UNAVAILABLE;