[PATCH] gprs: Fix allocation of context id read from settings

[PATCH] gprs: Fix allocation of context id read from settings

[richard.rojfors]

[-- Attachment #1: Type: text/plain, Size: 1038 bytes --]

From: Richard Röjfors <richard@puffinpack.se>

This fix is similar to the one in the following commit,
but fixes allocation for context ids after ap's are
read from settings.

commit c3fdf6a7c567a7507c3558a27006b6f9559493d6
Author: Denis Kenzior <denkenz@gmail.com>
Date:   Thu Jan 3 17:17:21 2019 -0600

    gprs: Fix allocation of context id
---
 src/gprs.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/gprs.c b/src/gprs.c
index b0d56e1e..d432c9fd 100644
--- a/src/gprs.c
+++ b/src/gprs.c
@@ -2340,7 +2340,11 @@ static void provision_context(const struct ofono_gprs_provision_data *ap,
 			strlen(ap->message_center) > MAX_MESSAGE_CENTER_LENGTH)
 		return;
 
-	id = l_uintset_find_unused(gprs->used_pids, gprs->last_context_id);
+	if (gprs->last_context_id)
+		id = l_uintset_find_unused(gprs->used_pids,
+							gprs->last_context_id);
+	else
+		id = l_uintset_find_unused_min(gprs->used_pids);
 	if (id > l_uintset_get_max(gprs->used_pids))
 		return;
 
-- 
2.19.1

Re: [PATCH] gprs: Fix allocation of context id read from settings

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 582 bytes --]

Hi Richard,

On 04/02/2019 02:28 AM, richard.rojfors(a)gmail.com wrote:
> From: Richard Röjfors <richard@puffinpack.se>
> 
> This fix is similar to the one in the following commit,
> but fixes allocation for context ids after ap's are
> read from settings.
> 
> commit c3fdf6a7c567a7507c3558a27006b6f9559493d6
> Author: Denis Kenzior <denkenz@gmail.com>
> Date:   Thu Jan 3 17:17:21 2019 -0600
> 
>      gprs: Fix allocation of context id
> ---
>   src/gprs.c | 6 +++++-
>   1 file changed, 5 insertions(+), 1 deletion(-)

Applied, thanks.

Regards,
-Denis