colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mm-bearer-qmi: remove default_ip_family_set check

Browse Source 
According to QC, we should set the IP family in both the
Set IP Family and Start Network messages. After removing this
check the member is never read, only written; this means it's
effectively dead and can be removed.
This commit is contained in:
Eric Caruso
2020-06-25 11:31:18 -07:00
committed by Aleksander Morgado
parent b0c212635d
commit 408a3d58c2
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/mm-bearer-qmi.c
View File

@@ -433,7 +433,6 @@ typedef struct {
gchar *apn; gchar *apn;
QmiWdsAuthentication auth; QmiWdsAuthentication auth;
gboolean no_ip_family_preference; gboolean no_ip_family_preference;
gboolean default_ip_family_set;
MMBearerIpMethod ip_method; MMBearerIpMethod ip_method;
@@ -669,11 +668,8 @@ build_start_network_input (ConnectContext *ctx)
/* Only add the IP family preference TLV if explicitly requested a given /* Only add the IP family preference TLV if explicitly requested a given
* family. This TLV may be newer than the Start Network command itself, so * family. This TLV may be newer than the Start Network command itself, so
* we'll just allow the case where none is specified. Also, don't add this * we'll just allow the case where none is specified. */
* TLV if we already set a default IP family preference with "WDS Set IP if (!ctx->no_ip_family_preference) {
* Family" */
if (!ctx->no_ip_family_preference &&
!ctx->default_ip_family_set) {
qmi_message_wds_start_network_input_set_ip_family_preference ( qmi_message_wds_start_network_input_set_ip_family_preference (
input, input,
(ctx->running_ipv6 ? QMI_WDS_IP_FAMILY_IPV6 : QMI_WDS_IP_FAMILY_IPV4), (ctx->running_ipv6 ? QMI_WDS_IP_FAMILY_IPV6 : QMI_WDS_IP_FAMILY_IPV4),
@@ -1015,13 +1011,8 @@ set_ip_family_ready (QmiClientWds *client,
} }
if (error) { if (error) {
/* Ensure we add the IP family preference TLV */
mm_obj_dbg (self, "couldn't set IP family preference: %s", error->message); mm_obj_dbg (self, "couldn't set IP family preference: %s", error->message);
g_error_free (error); g_error_free (error);
ctx->default_ip_family_set = FALSE;
} else {
/* No need to add IP family preference */
ctx->default_ip_family_set = TRUE;
} }
/* Keep on */ /* Keep on */
@@ -1407,8 +1398,6 @@ connect_context_step (GTask *task)
return; return;
} }
ctx->default_ip_family_set = FALSE;
ctx->step++; ctx->step++;
/* fall through */ /* fall through */