diff mbox series

[2/6] gobi: Rename KernelDriver to NetworkInterfaceDriver

Message ID 20240520191722.184977-2-denkenz@gmail.com (mailing list archive)
State Accepted
Commit df18422bafc8e56ea8443223b2c8ae34e6d94a2c
Headers show
Series [1/6] gobi: add / use DeviceProtocol property | expand

Commit Message

Denis Kenzior May 20, 2024, 7:17 p.m. UTC
The naming should now more accurately reflect what the driver string
represents.
---
 plugins/gobi.c   | 10 ++++++----
 plugins/udevng.c |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/plugins/gobi.c b/plugins/gobi.c
index d8b78ad6f5b0..5bb0b5ace0ca 100644
--- a/plugins/gobi.c
+++ b/plugins/gobi.c
@@ -103,9 +103,9 @@  static void gobi_debug(const char *str, void *user_data)
 static int gobi_probe(struct ofono_modem *modem)
 {
 	struct gobi_data *data;
-	const char *kernel_driver;
 	const char *value;
 	enum qmi_protocol protocol;
+	const char *if_driver;
 
 	DBG("%p", modem);
 
@@ -118,12 +118,14 @@  static int gobi_probe(struct ofono_modem *modem)
 	else
 		return -EPROTO;
 
+	if_driver = ofono_modem_get_string(modem,
+						"NetworkInterfaceKernelDriver");
+	DBG("netdev driver: %s", if_driver);
+
 	data = l_new(struct gobi_data, 1);
 	data->protocol = protocol;
-	kernel_driver = ofono_modem_get_string(modem, "KernelDriver");
-	DBG("kernel_driver: %s", kernel_driver);
 
-	if (!strcmp(kernel_driver, "qmi_wwan_q"))
+	if (!strcmp(if_driver, "qmi_wwan_q"))
 		data->using_qmi_wwan_q = true;
 
 	data->main_net_ifindex =
diff --git a/plugins/udevng.c b/plugins/udevng.c
index aa2a216d4247..c7db66238681 100644
--- a/plugins/udevng.c
+++ b/plugins/udevng.c
@@ -216,7 +216,7 @@  static int setup_qmi_netdev(struct modem_info *modem,
 	if (r < 0)
 		return r;
 
-	ofono_modem_set_string(modem->modem, "KernelDriver",
+	ofono_modem_set_string(modem->modem, "NetworkInterfaceKernelDriver",
 							net->kernel_driver);
 	ofono_modem_set_string(modem->modem, "NetworkInterface", net->devnode);
 	ofono_modem_set_integer(modem->modem, "NetworkInterfaceIndex",