sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

ublox: gprs-context: Fix router mode IP settings. 

The ublox modems always run DHCP when in router mode.
Unfortunately the code overwrote the IP settings with
static IP settings while activating.

Now we respect the networking_mode regardless if
we read settings during activation or read settings
phase.
This commit is contained in:
Richard Röjfors 2019-04-03 23:11:16 +02:00 committed by Denis Kenzior
parent b9fdba531f
commit 64df539a27
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/ubloxmodem/gprs-context.c
View File

@ -235,6 +235,14 @@ static void ublox_read_settings(struct ofono_gprs_context *gc)
{
struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
if (gcd->networking_mode == NETWORKING_MODE_ROUTER) {
/* Use DHCP */
set_gprs_context_interface(gc);
ofono_gprs_context_set_ipv4_address(gc, NULL, 0);
CALLBACK_WITH_SUCCESS(gcd->cb, gcd->cb_data);
return;
}
if (ublox_send_cgcontrdp(gc) < 0)
CALLBACK_WITH_FAILURE(gcd->cb, gcd->cb_data);
}
@ -247,15 +255,6 @@ static void ublox_gprs_read_settings(struct ofono_gprs_context *gc,
DBG("cid %u", cid);
if (gcd->networking_mode == NETWORKING_MODE_ROUTER) {
/* Use DHCP */
gcd->active_context = cid;
set_gprs_context_interface(gc);
ofono_gprs_context_set_ipv4_address(gc, NULL, 0);
CALLBACK_WITH_SUCCESS(cb, data);
return;
}
gcd->active_context = cid;
gcd->cb = cb;
gcd->cb_data = data;