From patchwork Sat Jan 12 11:34:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Shuai X-Patchwork-Id: 211489 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 639D32C0108 for ; Sat, 12 Jan 2013 22:35:09 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753049Ab3ALLfE (ORCPT ); Sat, 12 Jan 2013 06:35:04 -0500 Received: from mail-pb0-f51.google.com ([209.85.160.51]:63101 "EHLO mail-pb0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752775Ab3ALLfD (ORCPT ); Sat, 12 Jan 2013 06:35:03 -0500 Received: by mail-pb0-f51.google.com with SMTP id ro12so1407078pbb.10 for ; Sat, 12 Jan 2013 03:35:02 -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=6w0bM2LxlANpW7cNAZRbobIWQoZvX3FY58KnaMQITYY=; b=wjna2OQ6zmhY9BjXWIxQa2bn5NAUn3W4ikCYxKuEW/p6dWO4P8vZ+lijK9JaW4tw+F 5NytPj/Py5a6K1MJNwO2OQ8m9HWYgjw0xdPcxuXAlyMPvya+Lf8P3cxi+JqnGZEXAcPC dSWmqtOidCuTrdu82iKJ2f+2tHCV+UZ/DRCnscEjmORkU0+z25zJirV1CaAIIKzSzh5I fm+1yJTmt6nz1lOiZ/AN4a1j3CVubnnS4znFnMRgVYR2RdV/WeWBeDUb6V1w5X/gFRJe d6ghCZOi5Tcfm7fRhHLcPusV9cABvdfavYB+vyzN7xFRfliMsTUYcPKGYEz4foA0sV6o Vl/w== X-Received: by 10.66.52.102 with SMTP id s6mr215208547pao.6.1357990502117; Sat, 12 Jan 2013 03:35:02 -0800 (PST) Received: from localhost.localdomain ([101.86.145.45]) by mx.google.com with ESMTPS id j9sm4885647paw.2.2013.01.12.03.34.55 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 12 Jan 2013 03:35:01 -0800 (PST) From: Wei Shuai To: gregkh@linuxfoundation.org, alexey.orishko@stericsson.com, bjorn@mork.no Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, Wei Shuai Subject: [PATCH] CDC_NCM adding support IFF_NOARP for infineon modem platform Date: Sat, 12 Jan 2013 19:34:39 +0800 Message-Id: <1357990479-5836-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 Infineon(now Intel) HSPA Modem platform NCM cannot support ARP. so I introduce a flag CDC_NCM_DRIVER_DATA_NOARP which is defined in driver_info:data. so later on, if more such buggy devices are found, they could use same flag to handle. Signed-off-by: Wei Shuai --- drivers/net/usb/cdc_ncm.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c index 71b6e92..6093e07 100644 --- a/drivers/net/usb/cdc_ncm.c +++ b/drivers/net/usb/cdc_ncm.c @@ -55,6 +55,9 @@ #define DRIVER_VERSION "14-Mar-2012" +/* Flags for driver_info::data */ +#define CDC_NCM_DRIVER_DATA_NOARP 1 + static void cdc_ncm_txpath_bh(unsigned long param); static void cdc_ncm_tx_timeout_start(struct cdc_ncm_ctx *ctx); static enum hrtimer_restart cdc_ncm_tx_timer_cb(struct hrtimer *hr_timer); @@ -573,6 +576,10 @@ static int cdc_ncm_bind(struct usbnet *dev, struct usb_interface *intf) return -ENODEV; #endif + if (dev->driver_info->data & CDC_NCM_DRIVER_DATA_NOARP) { + /* some buggy device cannot do ARP*/ + dev->net->flags |= IFF_NOARP; + } /* NCM data altsetting is always 1 */ ret = cdc_ncm_bind_common(dev, intf, 1); @@ -1155,6 +1162,21 @@ static const struct driver_info wwan_info = { .tx_fixup = cdc_ncm_tx_fixup, }; +/* Same as wwan_info, but with IFF_NOARP */ +static const struct driver_info wwan_noarp_info = { + .description = "Mobile Broadband Network Device (NO ARP)", + .flags = FLAG_POINTTOPOINT | FLAG_NO_SETINT | FLAG_MULTI_PACKET + | FLAG_WWAN, + .data = CDC_NCM_DRIVER_DATA_NOARP, + .bind = cdc_ncm_bind, + .unbind = cdc_ncm_unbind, + .check_connect = cdc_ncm_check_connect, + .manage_power = usbnet_manage_power, + .status = cdc_ncm_status, + .rx_fixup = cdc_ncm_rx_fixup, + .tx_fixup = cdc_ncm_tx_fixup, +}; + static const struct usb_device_id cdc_devs[] = { /* Ericsson MBM devices like F5521gw */ { .match_flags = USB_DEVICE_ID_MATCH_INT_INFO @@ -1194,6 +1216,13 @@ static const struct usb_device_id cdc_devs[] = { .driver_info = (unsigned long)&wwan_info, }, + /* Infineon(now Intel) HSPA Modem platform */ + { USB_DEVICE_AND_INTERFACE_INFO(0x1519, 0x0443, + USB_CLASS_COMM, + USB_CDC_SUBCLASS_NCM, USB_CDC_PROTO_NONE), + .driver_info = (unsigned long)&wwan_noarp_info, + }, + /* Generic CDC-NCM devices */ { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_NCM, USB_CDC_PROTO_NONE),