From patchwork Sat Oct 26 13:54:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Aring X-Patchwork-Id: 286282 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 C704C2C00B7 for ; Sun, 27 Oct 2013 00:54:40 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753487Ab3JZNyd (ORCPT ); Sat, 26 Oct 2013 09:54:33 -0400 Received: from mail-ea0-f174.google.com ([209.85.215.174]:41977 "EHLO mail-ea0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751849Ab3JZNyV (ORCPT ); Sat, 26 Oct 2013 09:54:21 -0400 Received: by mail-ea0-f174.google.com with SMTP id z15so1288968ead.33 for ; Sat, 26 Oct 2013 06:54:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vfQ4kvjMxSAD2C64GCZUtB+wDxh/IsY5Bj5PRIRMJW8=; b=bnmdubMl5GqHYDB39Nzp+M0Rf77f6gidtDXGb95X+HrT9LHQbuR2fKj4PmtY7qoIj+ 9Rvk+b/hMs8PqttAj1rlVgGTaE2YmyP32475SMPpKBU26wq5X4nP5wNoOunLa5Mg20So PIr2YIBzbagFyxu8FXFl7lkMbd/GJ1FQSdYj3KqIxqf7xOn4nNNR9nahN8zyFJu9k5rh qLoARr2X3o52RSNzEUy1uBUT1Jf2pqkiL0XWUcnlxuQC+w4NBvONQCxkVmDGZH2ZBa6s QgfVh2Yu9FKjuPG6I/9QD9V3eQyBz9tfyYqqK71pcff7y+xs2/E+ylWCuVV0GRbE0zL6 p1OQ== X-Received: by 10.14.198.197 with SMTP id v45mr13226255een.52.1382795660280; Sat, 26 Oct 2013 06:54:20 -0700 (PDT) Received: from localhost.localdomain (p4FD31CA4.dip0.t-ipconnect.de. [79.211.28.164]) by mx.google.com with ESMTPSA id w6sm31227016eeo.12.2013.10.26.06.54.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 26 Oct 2013 06:54:19 -0700 (PDT) From: Alexander Aring To: alex.bluesman.smirnov@gmail.com Cc: linux-zigbee-devel@lists.sourceforge.net, werner@almesberger.net, dbaryshkov@gmail.com, netdev@vger.kernel.org, Alexander Aring Subject: [PATCH net-next v2 3/5] 6lowpan: use netdev_alloc_skb instead dev_alloc_skb Date: Sat, 26 Oct 2013 15:54:00 +0200 Message-Id: <1382795642-12501-4-git-send-email-alex.aring@gmail.com> X-Mailer: git-send-email 1.8.4.1 In-Reply-To: <1382795642-12501-1-git-send-email-alex.aring@gmail.com> References: <1382795642-12501-1-git-send-email-alex.aring@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch uses the netdev_alloc_skb instead dev_alloc_skb function and drops the seperate assignment to skb->dev. Signed-off-by: Alexander Aring Reviewed-by: Werner Almesberger --- net/ieee802154/6lowpan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c index 9057f83..1884a84 100644 --- a/net/ieee802154/6lowpan.c +++ b/net/ieee802154/6lowpan.c @@ -1127,12 +1127,12 @@ lowpan_fragment_xmit(struct sk_buff *skb, u8 *head, lowpan_raw_dump_inline(__func__, "6lowpan fragment header", head, hlen); - frag = dev_alloc_skb(hlen + mlen + plen + IEEE802154_MFR_SIZE); + frag = netdev_alloc_skb(skb->dev, hlen + mlen + + plen + IEEE802154_MFR_SIZE); if (!frag) return -ENOMEM; frag->priority = skb->priority; - frag->dev = skb->dev; /* copy header, MFR and payload */ memcpy(skb_put(frag, mlen), skb->data, mlen);