From patchwork Thu Jan 10 13:59:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Shuai X-Patchwork-Id: 211009 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 482072C0131 for ; Fri, 11 Jan 2013 01:01:21 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752023Ab3AJOBR (ORCPT ); Thu, 10 Jan 2013 09:01:17 -0500 Received: from mail-pb0-f43.google.com ([209.85.160.43]:52142 "EHLO mail-pb0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751041Ab3AJOBQ (ORCPT ); Thu, 10 Jan 2013 09:01:16 -0500 Received: by mail-pb0-f43.google.com with SMTP id um15so314252pbc.2 for ; Thu, 10 Jan 2013 06:01:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=GK8OO9w8KxPaFg03gp3dvo0/1ZHAGWzcUT4jJeYj77w=; b=zDWlw2kj+XGEy368PODPzP/YS27oKZJkeACmFcklvOsHyEt8AJTS3NNRJObUyS+YpI dHmlqJOiIxidyIOWFlTd87Y8UKCeR1sZ6ZxB/Buv/V4XzVhxWBnI3TiWQSaMh9/TzFHB Dg10Wu14X/kccAnyViE+zZZ76KFkm4V+5sYF9yHtB+s8xWwnqB75xY1pnv4BvoA8QIWm eDebHdf5xWERsF6lQpkBfJ8s7GstFiaR4STVXzdEM69uRhYHhiwqJZwXq9TwwujXkc+l g0scx4F0x4uULVedkYYXyrhoUSFKDOLK8mKcpTRPsCL/kB3JG7uywiGcVP4KFNs3Li5W EWZQ== X-Received: by 10.66.80.68 with SMTP id p4mr198150336pax.35.1357826475972; Thu, 10 Jan 2013 06:01:15 -0800 (PST) Received: from localhost.localdomain ([101.86.145.45]) by mx.google.com with ESMTPS id t6sm1097583paz.11.2013.01.10.06.01.11 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 10 Jan 2013 06:01:15 -0800 (PST) From: Wei Shuai To: gregkh@linuxfoundation.org, alexey.orishko@stericsson.com, hans.petter.selasky@stericsson.com Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, Wei Shuai Subject: [PATCH] CDC_NCM adding support IFF_NOARP for buggy device Date: Thu, 10 Jan 2013 21:59:28 +0800 Message-Id: <1357826368-30543-1-git-send-email-cpuwolf@gmail.com> X-Mailer: git-send-email 1.7.6.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Wei Shuai --- drivers/net/usb/cdc_ncm.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c index 71b6e92..9903f79 100644 --- a/drivers/net/usb/cdc_ncm.c +++ b/drivers/net/usb/cdc_ncm.c @@ -545,6 +545,7 @@ EXPORT_SYMBOL_GPL(cdc_ncm_unbind); static int cdc_ncm_bind(struct usbnet *dev, struct usb_interface *intf) { int ret; + struct usb_device *udev = interface_to_usbdev(intf); /* The MBIM spec defines a NCM compatible default altsetting, * which we may have matched: @@ -572,6 +573,10 @@ static int cdc_ncm_bind(struct usbnet *dev, struct usb_interface *intf) cdc_ncm_comm_intf_is_mbim(intf->cur_altsetting)) return -ENODEV; #endif + /* this buggy device cannot do ARP */ + if( (le16_to_cpu(udev->descriptor.idVendor) == 0xAAAA) ) { + dev->net->flags |= IFF_NOARP; + } /* NCM data altsetting is always 1 */ ret = cdc_ncm_bind_common(dev, intf, 1); @@ -1186,6 +1191,16 @@ static const struct usb_device_id cdc_devs[] = { .driver_info = (unsigned long) &wwan_info, }, + /* buggy device cannot send ARP */ + { .match_flags = USB_DEVICE_ID_MATCH_INT_INFO + | USB_DEVICE_ID_MATCH_VENDOR, + .idVendor = 0xAAAA, + .bInterfaceClass = USB_CLASS_COMM, + .bInterfaceSubClass = USB_CDC_SUBCLASS_NCM, + .bInterfaceProtocol = USB_CDC_PROTO_NONE, + .driver_info = (unsigned long) &wwan_info, + }, + /* Huawei NCM devices disguised as vendor specific */ { USB_VENDOR_AND_INTERFACE_INFO(0x12d1, 0xff, 0x02, 0x16), .driver_info = (unsigned long)&wwan_info,