From b19c951c53b8aaf2309368b3fe6fa1b83eb542ea Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sun, 27 Apr 2025 22:07:39 +0300 Subject: [PATCH] Revert "MOTODESK-3077 Change the NCM default interface name to ncm0" This reverts commit 26b7fe96b7714fbd869f2412ce9b77f033a0bc5f. Reason for revert: Conflicts with upstream changes. Change-Id: I6d4e53f84ffc56f63d180cc9e782c97d57b5c716 --- drivers/usb/gadget/function/f_ncm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c index e389d4098796..03851c9c770a 100644 --- a/drivers/usb/gadget/function/f_ncm.c +++ b/drivers/usb/gadget/function/f_ncm.c @@ -1470,8 +1470,7 @@ static int ncm_bind(struct usb_configuration *c, struct usb_function *f) */ if (!ncm_opts->bound) { mutex_lock(&ncm_opts->lock); - /* MOTODESK-3077 Use ncm interface name. suzh1 2021-04-03 */ - ncm_opts->net = gether_setup_name_default("ncm"); + ncm_opts->net = gether_setup_default(); if (IS_ERR(ncm_opts->net)) { status = PTR_ERR(ncm_opts->net); mutex_unlock(&ncm_opts->lock);