From patchwork Sun Nov 6 19:33:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konstantin Khlebnikov X-Patchwork-Id: 123954 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 D5056B6F6B for ; Mon, 7 Nov 2011 05:34:00 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754029Ab1KFSdv (ORCPT ); Sun, 6 Nov 2011 13:33:51 -0500 Received: from mail-bw0-f46.google.com ([209.85.214.46]:46007 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754269Ab1KFSdv (ORCPT ); Sun, 6 Nov 2011 13:33:51 -0500 Received: by bke11 with SMTP id 11so3116937bke.19 for ; Sun, 06 Nov 2011 10:33:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:subject:to:from:cc:date:message-id:user-agent:mime-version :content-type:content-transfer-encoding; bh=nguy1L9MsL6yE+MX7bwV65dYi0cydDFYaYrqwaso+UI=; b=WElCEIXbqit1dXFhgczqevUXbtx9YVzzQKHti3Af5phMMVLTUhKtzxIQ91gGDiIHF1 NInNgNLfVEytnr7cBFRmr6PKpCyaVMynSWJ6qaFWGeYpBHqaLUWIjHqeYNp9lnVbAOj7 66sUOtXKfgf0ueaetw27h0bbXMxbhFSDm9fLA= Received: by 10.204.29.8 with SMTP id o8mr16872521bkc.48.1320604429525; Sun, 06 Nov 2011 10:33:49 -0800 (PST) Received: from localhost ([83.149.9.52]) by mx.google.com with ESMTPS id b20sm11096749bkr.11.2011.11.06.10.33.44 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 06 Nov 2011 10:33:48 -0800 (PST) Subject: [PATCH] usbnet: fix oops in usbnet_start_xmit To: Oliver Neukum From: Konstantin Khlebnikov Cc: netdev@vger.kernel.org, "David S. Miller" , devel@openvz.org, Michael Riesch Date: Sun, 06 Nov 2011 22:33:37 +0300 Message-ID: <20111106183337.5379.4356.stgit@zurg> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch fixes the bug added in commit v3.1-rc7-1055-gf9b491e SKB can be NULL at this point, at least for cdc-ncm. Let's call skb_tx_timestamp() after driver specific tx-fixup hacks. Signed-off-by: Konstantin Khlebnikov --- drivers/net/usb/usbnet.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 7d60821..485be70 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -1057,8 +1057,6 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb, unsigned long flags; int retval; - skb_tx_timestamp(skb); - // some devices want funky USB-level framing, for // win32 driver (usually) and/or hardware quirks if (info->tx_fixup) { @@ -1075,6 +1073,8 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb, } length = skb->len; + skb_tx_timestamp(skb); + if (!(urb = usb_alloc_urb (0, GFP_ATOMIC))) { netif_dbg(dev, tx_err, dev->net, "no urb\n"); goto drop;