On Wed, 2016-06-08 at 16:20 -0400, Tony Espy wrote:
> From: Mathieu Trudel-Lapierre <mathieu.trudel-lapie...@canonical.com>
>
> Gbp-Pq: Name Ignore-rild-modem-devices.patch
> ---
> src/nm-manager.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/src/nm-manager.c b/src/nm-manager.c
> index 10aa3d7..c2ed1da 100644
> --- a/src/nm-manager.c
> +++ b/src/nm-manager.c
> @@ -2089,6 +2089,14 @@ platform_link_added (NMManager *self,
> gboolean ignore = FALSE;
> gs_free_error GError *error = NULL;
>
> + /* Ignore rild modem devices, which will be handled
> by their modem parent */
> + if (g_strstr_len (plink->name, NM_STRLEN ("rmnet"),
> "rmnet") ||
> + g_strstr_len (plink->name, NM_STRLEN
> ("rev_rmnet"), "rev_rmnet") ||
> + g_strstr_len (plink->name, NM_STRLEN
> ("ccmni"), "ccmni")) {
> + _LOGW (LOGD_HW, "Ignoring rild modem device:
> %s", plink->name);
> + return;
> + }
> +
> device = nm_device_factory_create_device (factory,
> plink->name, plink, NULL, &ignore, &error);
> if (!device) {
> if (!ignore) {
g_strstr_len (plink->name, NM_STRLEN ("rmnet"), "rmnet")
is identical to
g_str_has_prefix (plink->name, "rmnet")
or
strncmp (plink->name, "rmnet", NM_STRLEN ("rmnet")) == 0
isn't it?
g_str_has_prefix() seems easier to understand in this case.
signature.asc
Description: This is a digitally signed message part
_______________________________________________ networkmanager-list mailing list networkmanager-list@gnome.org https://mail.gnome.org/mailman/listinfo/networkmanager-list
