From 26b7fe96b7714fbd869f2412ce9b77f033a0bc5f Mon Sep 17 00:00:00 2001 From: Mike SU Date: Sat, 3 Apr 2021 17:55:49 +0800 Subject: [PATCH] MOTODESK-3077 Change the NCM default interface name to ncm0 The NCM default interface name "usb0" is confused. Use "ncm0" better. Change-Id: I361074b9a3b04968f477d78e7c5a4fd6fe418fdc Reviewed-on: https://gerrit.mot.com/1916424 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Yuecai Liu Reviewed-by: Huosheng Liao Reviewed-by: Xuejin Wang Submit-Approved: Jira Key --- drivers/usb/gadget/function/f_ncm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c index d6f50ecbad03..e379cac90ed7 100644 --- a/drivers/usb/gadget/function/f_ncm.c +++ b/drivers/usb/gadget/function/f_ncm.c @@ -1462,7 +1462,8 @@ static int ncm_bind(struct usb_configuration *c, struct usb_function *f) */ if (!ncm_opts->bound) { mutex_lock(&ncm_opts->lock); - ncm_opts->net = gether_setup_default(); + /* MOTODESK-3077 Use ncm interface name. suzh1 2021-04-03 */ + ncm_opts->net = gether_setup_name_default("ncm"); if (IS_ERR(ncm_opts->net)) { status = PTR_ERR(ncm_opts->net); mutex_unlock(&ncm_opts->lock);