Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp2891585pxb; Sun, 15 Nov 2020 22:55:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJxjN7sMRnsHm6P+pVnDiRG2lZN5ct+P2yWiMe7ZCwtso87s7e6Qd1gW8GzC4Y1jwH/2aX94 X-Received: by 2002:a17:906:3641:: with SMTP id r1mr12761603ejb.405.1605509745829; Sun, 15 Nov 2020 22:55:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605509745; cv=none; d=google.com; s=arc-20160816; b=ks+imApAnsuICNMhApPf4ZhKhIn7gXMk6AvAcTHLFLNzsNQt9IILZRo/rkt4WYVRz/ Bw6YcplachjrBNFGAAccV6FfePcTbM/Aev8CyURDzfJVc9zMnPa2/0Lrg6g8rEFFO6EY 86Y8CxUHrNgxxGCtuWpQmq1Dg2H5O+TaB+N1fznDZwdGVo37t6e5ulmJiV9MoNZdQoF1 bP5sFriuOspXJ0TgTZSMDeTcm5bRmvNOXR55M056SIY04uLVs9XFVsbXOAdzmzp8YKbg VX9z3Rea8eEp7a5L5zkZ319ANXqMJK5L+Kf+o6JKHUj5YSEabr9gpLfngk3h/Tjw+yGv FN2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :authenticated-by; bh=VjveaUGlhzxYu6r/+/GF1TqdIXZ1/RFkbcl/y3g7CMs=; b=CWyFmAaYlA7wItqN198w0B2+NJfhRm4LkdysTJTbnKbJAEpDqVtF11YSHDbl2BiYLo Uz/XtgON5V1y7ZBrgDTYFwy1WVhDys/37FHFhbeMjKS7FZ4ABL8DJzDJpaNmbiCq2M6D j6/LYBTlRz3bK8m2mutIXEkA+PoXPA0fnJYTXkCGXJ4+EAqWyBgQCx4dIDY0u4Dym96c HEa5XlBJqn+mHI0Dp+Mu8zG0MTWnf/aKHFa2aQD30BX8bK8PxQY9mqx31VYtyNI+wnw0 Du3Nko/tPt5OOvmGUEr61O2CE/ddRdkIeDNa29N5PtTRloP2JcvCYRknb4kuhSzYMReG upDg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h23si1743900ejl.194.2020.11.15.22.55.23; Sun, 15 Nov 2020 22:55:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726980AbgKPGxN (ORCPT + 99 others); Mon, 16 Nov 2020 01:53:13 -0500 Received: from rtits2.realtek.com ([211.75.126.72]:52815 "EHLO rtits2.realtek.com.tw" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725819AbgKPGxN (ORCPT ); Mon, 16 Nov 2020 01:53:13 -0500 Authenticated-By: X-SpamFilter-By: ArmorX SpamTrap 5.73 with qID 0AG6r9DM1027092, This message is accepted by code: ctloc85258 Received: from mail.realtek.com (rtexmb04.realtek.com.tw[172.21.6.97]) by rtits2.realtek.com.tw (8.15.2/2.70/5.88) with ESMTPS id 0AG6r9DM1027092 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Mon, 16 Nov 2020 14:53:09 +0800 Received: from fc32.localdomain (172.21.177.102) by RTEXMB04.realtek.com.tw (172.21.6.97) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2044.4; Mon, 16 Nov 2020 14:53:09 +0800 From: Hayes Wang To: , CC: , , , Hayes Wang Subject: [PATCH net-next] r8153_ecm: avoid to be prior to r8152 driver Date: Mon, 16 Nov 2020 14:52:39 +0800 Message-ID: <1394712342-15778-393-Taiwan-albertk@realtek.com> X-Mailer: Microsoft Office Outlook 11 In-Reply-To: <7fd014f2-c9a5-e7ec-f1c6-b3e4bb0f6eb6@samsung.com> References: <7fd014f2-c9a5-e7ec-f1c6-b3e4bb0f6eb6@samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [172.21.177.102] X-ClientProxiedBy: RTEXMB01.realtek.com.tw (172.21.6.94) To RTEXMB04.realtek.com.tw (172.21.6.97) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Avoid r8153_ecm is compiled as built-in, if r8152 driver is compiled as modules. Otherwise, the r8153_ecm would be used, even though the device is supported by r8152 driver. Fixes: c1aedf015ebd ("net/usb/r8153_ecm: support ECM mode for RTL8153") Reported-by: Marek Szyprowski Signed-off-by: Hayes Wang --- drivers/net/usb/Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/net/usb/Makefile b/drivers/net/usb/Makefile index 99381e6bea78..98f4c100955e 100644 --- a/drivers/net/usb/Makefile +++ b/drivers/net/usb/Makefile @@ -13,7 +13,7 @@ obj-$(CONFIG_USB_LAN78XX) += lan78xx.o obj-$(CONFIG_USB_NET_AX8817X) += asix.o asix-y := asix_devices.o asix_common.o ax88172a.o obj-$(CONFIG_USB_NET_AX88179_178A) += ax88179_178a.o -obj-$(CONFIG_USB_NET_CDCETHER) += cdc_ether.o r8153_ecm.o +obj-$(CONFIG_USB_NET_CDCETHER) += cdc_ether.o obj-$(CONFIG_USB_NET_CDC_EEM) += cdc_eem.o obj-$(CONFIG_USB_NET_DM9601) += dm9601.o obj-$(CONFIG_USB_NET_SR9700) += sr9700.o @@ -41,3 +41,11 @@ obj-$(CONFIG_USB_NET_QMI_WWAN) += qmi_wwan.o obj-$(CONFIG_USB_NET_CDC_MBIM) += cdc_mbim.o obj-$(CONFIG_USB_NET_CH9200) += ch9200.o obj-$(CONFIG_USB_NET_AQC111) += aqc111.o + +ifdef CONFIG_USB_NET_CDCETHER +ifeq ($(CONFIG_USB_RTL8152), m) +obj-$(CONFIG_USB_RTL8152) += r8153_ecm.o +else +obj-$(CONFIG_USB_NET_CDCETHER) += r8153_ecm.o +endif +endif -- 2.26.2