From patchwork Thu Feb 13 18:30:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Emil Goode X-Patchwork-Id: 320147 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 A6A8A2C00B3 for ; Fri, 14 Feb 2014 05:28:43 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752677AbaBMS21 (ORCPT ); Thu, 13 Feb 2014 13:28:27 -0500 Received: from mail-la0-f46.google.com ([209.85.215.46]:54557 "EHLO mail-la0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752172AbaBMS2Z (ORCPT ); Thu, 13 Feb 2014 13:28:25 -0500 Received: by mail-la0-f46.google.com with SMTP id b8so8518005lan.33 for ; Thu, 13 Feb 2014 10:28:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=LrlKpzS+WGNQOeP9S24Uao+1FMVBQW21mqhm/QmNGEk=; b=m3dwnbL5E2G/XmKnXHkY0rP2jrtJwR19xvaxxbsnPUWxAdOWy1iu1XwwIqzFxeqasX bKPr7R+xNwqoQ3nlAVqzGDaDnJYrxadx1O1fy7erk4KH+zJjkvzRxJGNw0W9OtdIfmfU As5ILTv8JBTdrMp7/vvLl0MBzOiggl3Y249qm7HVGoZ8dQ4xdZ9DAw0pb/UVsYdF6HMz TvJJsxL7W+06Wobh7ZLrito//QVM5A3QXtUFn6GjMQRQ/PMoKxOIrY16Df2a5rqtF7gd eImv5cE2jeHBSUsgGo1jdTzMWVWnqABAo1/VBKqJ7lp4xemvn6cHP2whziXui1OYwbzH jrSw== X-Received: by 10.112.134.38 with SMTP id ph6mr1970946lbb.16.1392316104038; Thu, 13 Feb 2014 10:28:24 -0800 (PST) Received: from localhost.localdomain (c193-14-149-135.cust.tele2.se. [193.14.149.135]) by mx.google.com with ESMTPSA id e1sm4106367laa.8.2014.02.13.10.28.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Feb 2014 10:28:23 -0800 (PST) From: Emil Goode To: "David S. Miller" , Ming Lei , Mark Brown , Jeff Kirsher , Glen Turner Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Emil Goode Subject: [PATCH Resend] net: asix: add missing flag to struct driver_info Date: Thu, 13 Feb 2014 19:30:39 +0100 Message-Id: <1392316239-17335-1-git-send-email-emilgoode@gmail.com> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The struct driver_info ax88178_info is assigned the function asix_rx_fixup_common as it's rx_fixup callback. This means that FLAG_MULTI_PACKET must be set as this function is cloning the data and calling usbnet_skb_return. Not setting this flag leads to usbnet_skb_return beeing called a second time from within the rx_process function in the usbnet module. Signed-off-by: Emil Goode Reported-by: Bjørn Mork --- drivers/net/usb/asix_devices.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c index 9765a7d..5d19409 100644 --- a/drivers/net/usb/asix_devices.c +++ b/drivers/net/usb/asix_devices.c @@ -917,7 +917,8 @@ static const struct driver_info ax88178_info = { .status = asix_status, .link_reset = ax88178_link_reset, .reset = ax88178_reset, - .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR, + .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR | + FLAG_MULTI_PACKET, .rx_fixup = asix_rx_fixup_common, .tx_fixup = asix_tx_fixup, };