From patchwork Mon Mar 31 16:11:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yegor Yefremov X-Patchwork-Id: 335463 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 84A711400AD for ; Tue, 1 Apr 2014 03:11:54 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754091AbaCaQLt (ORCPT ); Mon, 31 Mar 2014 12:11:49 -0400 Received: from mail-bk0-f44.google.com ([209.85.214.44]:34930 "EHLO mail-bk0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754049AbaCaQLs (ORCPT ); Mon, 31 Mar 2014 12:11:48 -0400 Received: by mail-bk0-f44.google.com with SMTP id mz13so1196626bkb.17 for ; Mon, 31 Mar 2014 09:11:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=LfyYZLhujpY5auEb1tkO+OlN5h/7DphFAtXCcO8oLQ8=; b=fSzikAgcxDY/PlFF2tf9wbjOA9RjL/n5M9gs/FSMyfvgkam2Uk/8QDt1Dd7Or07UOZ aF5AZTRtt7FZs1s7HzXuZVH1FDMkZaiQeHX0HYeziaLbdDczxgtaDb2q6J18M5Z97+9M GhxFCECh6Vo62AQ/3s9k4qEEDOVlV1fP37ZuFRj/T5QBX38mmgWxaS+oa8wPUbi+R1hD M5fl7MXM50WsMN1oUqwCB5+KXqBDlik3WloAk24pxlvn9Sn3BKSQN+4nOwjZiklU0emg qEAgUJXOzs3UiN1JutVOsEirslXILsQd5Rm2ojMFHRC9pGDXB+S7FC3DKdMUfFYKJsBZ NP5g== X-Received: by 10.204.105.135 with SMTP id t7mr1234099bko.59.1396282306853; Mon, 31 Mar 2014 09:11:46 -0700 (PDT) Received: from user-Lenovo-IdeaPad-Z500.localdomain (x2f0a1bf.dyn.telefonica.de. [2.240.161.191]) by mx.google.com with ESMTPSA id dj6sm14076192bkc.5.2014.03.31.09.11.44 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 09:11:45 -0700 (PDT) From: Yegor Yefremov To: netdev@vger.kernel.org Cc: bjorn@mork.no, dcbw@redhat.com, davem@davemloft.net, Yegor Yefremov Subject: [PATCH v2] qmi_wwan/cdc_ether: move Novatel E371 (1410:9011) to qmi_wwan Date: Mon, 31 Mar 2014 18:11:27 +0200 Message-Id: <1396282287-5060-1-git-send-email-yegorslists@googlemail.com> X-Mailer: git-send-email 1.8.3.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This device provides QMI and ethernet functionality via a standard CDC ethernet descriptor. But when driven by cdc_ether, the QMI functionality is unavailable because only cdc_ether can claim the USB interface. Thus blacklist the device in cdc_ether and add its IDs to qmi_wwan, which enables both QMI and ethernet simultaneously. Signed-off-by: Yegor Yefremov --- Changes: v2: fix indentation drivers/net/usb/cdc_ether.c | 7 +++++++ drivers/net/usb/qmi_wwan.c | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index bd363b2..9ea4bfe 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c @@ -625,6 +625,13 @@ static const struct usb_device_id products[] = { .driver_info = 0, }, +/* Novatel Expedite E371 - handled by qmi_wwan */ +{ + USB_DEVICE_AND_INTERFACE_INFO(NOVATEL_VENDOR_ID, 0x9011, USB_CLASS_COMM, + USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), + .driver_info = 0, +}, + /* AnyDATA ADU960S - handled by qmi_wwan */ { USB_DEVICE_AND_INTERFACE_INFO(0x16d5, 0x650a, USB_CLASS_COMM, diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c index 313cb6c..c912966 100644 --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c @@ -500,6 +500,13 @@ static const struct usb_device_id products[] = { USB_CDC_PROTO_NONE), .driver_info = (unsigned long)&qmi_wwan_info, }, + { /* Novatel Expedite E371 */ + USB_DEVICE_AND_INTERFACE_INFO(0x1410, 0x9011, + USB_CLASS_COMM, + USB_CDC_SUBCLASS_ETHERNET, + USB_CDC_PROTO_NONE), + .driver_info = (unsigned long)&qmi_wwan_info, + }, { /* Dell Wireless 5800 (Novatel E362) */ USB_DEVICE_AND_INTERFACE_INFO(0x413C, 0x8195, USB_CLASS_COMM,