diff options
| author | Eric Caruso <ejcaruso@chromium.org> | 2020-06-25 11:31:18 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2020-10-08 07:54:50 +0000 |
| commit | 408a3d58c2629fa197ddeadc65b5a5789195e810 (patch) | |
| tree | b159cbc852a34db0081862a9cdf34ca0a98bd376 | |
| parent | b0c212635d3fe4ec0bd4257d4554d6cf3767fb29 (diff) | |
mm-bearer-qmi: remove default_ip_family_set check
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.
| -rw-r--r-- | src/mm-bearer-qmi.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/mm-bearer-qmi.c b/src/mm-bearer-qmi.c index 45185c6a..b00df788 100644 --- a/src/mm-bearer-qmi.c +++ b/src/mm-bearer-qmi.c @@ -433,7 +433,6 @@ typedef struct { gchar *apn; QmiWdsAuthentication auth; gboolean no_ip_family_preference; - gboolean default_ip_family_set; 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 * 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 - * TLV if we already set a default IP family preference with "WDS Set IP - * Family" */ - if (!ctx->no_ip_family_preference && - !ctx->default_ip_family_set) { + * we'll just allow the case where none is specified. */ + if (!ctx->no_ip_family_preference) { qmi_message_wds_start_network_input_set_ip_family_preference ( input, (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) { - /* Ensure we add the IP family preference TLV */ mm_obj_dbg (self, "couldn't set IP family preference: %s", error->message); 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 */ @@ -1407,8 +1398,6 @@ connect_context_step (GTask *task) return; } - ctx->default_ip_family_set = FALSE; - ctx->step++; /* fall through */ |