[1/3] udevng: Remove Modem setting from setup_gobi

Commit Message

Steve Schrock July 1, 2024, 3:25 p.m. UTC

gobi doesn't actually use the "Modem" setting since it communicates
using the qmi protocol. The fact that setup_gobi required this
interface actually caused certain modems to fail inside setup_gobi
since mdm was not being set.
---
 plugins/udevng.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

Comments

[e-mail] July 1, 2024, 7:30 p.m. UTC | #1

Hello:

This series was applied to ofono.git (master)
by Denis Kenzior <[e-mail]>:

On Mon,  1 Jul 2024 15:25:49 +0000 you wrote:
> gobi doesn't actually use the "Modem" setting since it communicates
> using the qmi protocol. The fact that setup_gobi required this
> interface actually caused certain modems to fail inside setup_gobi
> since mdm was not being set.
> ---
>  plugins/udevng.c | 12 +++---------
>  1 file changed, 3 insertions(+), 9 deletions(-)

Here is the summary with links:
  - [1/3] udevng: Remove Modem setting from setup_gobi
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=2f7a01d0c722
  - [2/3] udevng: Remove Diag setting from setup_gobi
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=3071e0720e8e
  - [3/3] udevng: Remove gps from setup_gobi
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=57f914624cf9

You are awesome, thank you!

Patch

diff --git a/plugins/udevng.c b/plugins/udevng.c
index 789592e6ec99..271d43b16336 100644
--- a/plugins/udevng.c
+++ b/plugins/udevng.c
@@ -355,7 +355,6 @@  static gboolean setup_gobi(struct modem_info *modem)
 {
 	const struct device_info *qmi = NULL;
 	const struct device_info *net = NULL;
-	const char *mdm = NULL;
 	const char *gps = NULL;
 	const char *diag = NULL;
 	GSList *list;
@@ -381,30 +380,25 @@  static gboolean setup_gobi(struct modem_info *modem)
 					diag = info->devnode; /* ec20 */
 				else if (g_strcmp0(info->number, "01") == 0)
 					diag = info->devnode; /* gobi */
-				else if (g_strcmp0(info->number, "02") == 0)
-					mdm = info->devnode; /* gobi */
 				else if (g_strcmp0(info->number, "03") == 0)
 					gps = info->devnode; /* gobi */
 			} else if (g_strcmp0(info->interface, "255/0/0") == 0) {
 				if (g_strcmp0(info->number, "01") == 0)
 					gps = info->devnode; /* ec20 */
-				if (g_strcmp0(info->number, "02") == 0)
-					mdm = info->devnode; /* ec20 */
 				/* ignore the 3rd device second AT/mdm iface */
 			}
 		}
 	}
 
-	if (qmi == NULL || mdm == NULL || net == NULL)
+	if (qmi == NULL || net == NULL)
 		return FALSE;
 
-	DBG("qmi=%s net=%s mdm=%s gps=%s diag=%s",
-			qmi->devnode, get_ifname(net), mdm, gps, diag);
+	DBG("qmi=%s net=%s gps=%s diag=%s",
+			qmi->devnode, get_ifname(net), gps, diag);
 
 	if (setup_qmi_qmux(modem, qmi, net) < 0)
 		return FALSE;
 
-	ofono_modem_set_string(modem->modem, "Modem", mdm);
 	ofono_modem_set_string(modem->modem, "Diag", diag);
 
 	return TRUE;