From patchwork Thu Dec 17 11:44:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Bj=C3=B8rn_Mork?= X-Patchwork-Id: 558221 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 118E11401E7 for ; Thu, 17 Dec 2015 22:44:31 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=mork.no header.i=@mork.no header.b=SWPo8NvJ; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754261AbbLQLo0 (ORCPT ); Thu, 17 Dec 2015 06:44:26 -0500 Received: from canardo.mork.no ([148.122.252.1]:43602 "EHLO canardo.mork.no" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751278AbbLQLoZ (ORCPT ); Thu, 17 Dec 2015 06:44:25 -0500 Received: from nemi.mork.no ([IPv6:2a02:2121:89:4648:7c77:3dfc:49f0:3b4]) (authenticated bits=0) by canardo.mork.no (8.14.4/8.14.4) with ESMTP id tBHBiKuY032007 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=OK); Thu, 17 Dec 2015 12:44:21 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mork.no; s=a; t=1450352661; bh=DU6od8cNPTRRr5L26ZsC9Qk1k88HREVi7q62Eo4NNZY=; h=From:To:Cc:Date:Message-Id:From; b=SWPo8NvJIHWQzQ6NJ+Te4ptvhHVZXDi3RehpDXeThOlgvJl+L2ItA4zVywUCGCSyL ijQyWE/Krh0hvebS3xURMPub3ZBuykHaNQ3ZqIDGJv9kksRz+5SI06NzxS/B5fEH66 CTBEy9cZ5qhNXdOOm51ScGJrjfPuD2nVwa/Qgiv5wd7h1cNPpTH5i7sLKdcdurf8uW asx7FTVwqatGPeRZpvTxbYfXX7+qR87ePQbkATscK0lfmyMg2k6dncj5DOr66taiSe BpPfyfnlvBTRMkiot9lmHJjUXx5qwAHBXHWbjAT9vk7EmRSHNUomirYM8rtDnYy/Fr fDWKdPplRKYfQ== Received: from bjorn by nemi.mork.no with local (Exim 4.84) (envelope-from ) id 1a9Wyk-0003FK-Tx; Thu, 17 Dec 2015 12:44:14 +0100 From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= To: netdev@vger.kernel.org Cc: Kanerva Topi , linux-usb@vger.kernel.org, =?UTF-8?q?Bj=C3=B8rn=20Mork?= Subject: [PATCH net-next] net: qmi_wwan: ignore bogus CDC Union descriptors Date: Thu, 17 Dec 2015 12:44:04 +0100 Message-Id: <1450352644-12445-1-git-send-email-bjorn@mork.no> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.98.7 at canardo X-Virus-Status: Clean Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The CDC descriptors found on these vendor specific functions should not be considered authoritative. They seem to be ignored by drivers for other systems, and the quality is therefore low. One device (1e0e:9001) has been reported to have such a bogus union descriptor on the QMI function, making it fail probing even if the device id was dynamically added. The report was not complete enough to allow adding a device entry for this modem. But this should at least fix the dynamic id probing problem. Reported-by: Kanerva Topi Signed-off-by: Bjørn Mork --- drivers/net/usb/qmi_wwan.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c index 6f3bf75147e2..ad1f7dfac590 100644 --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c @@ -374,7 +374,10 @@ static int qmi_wwan_bind(struct usbnet *dev, struct usb_interface *intf) "bogus CDC Union: master=%u, slave=%u\n", cdc_union->bMasterInterface0, cdc_union->bSlaveInterface0); - goto err; + + /* ignore and continue... */ + cdc_union = NULL; + info->data = intf; } }