From patchwork Wed Jul 11 07:22:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alex.bluesman.smirnov@gmail.com X-Patchwork-Id: 170379 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 716982C01B4 for ; Wed, 11 Jul 2012 17:27:06 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756714Ab2GKH1E (ORCPT ); Wed, 11 Jul 2012 03:27:04 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:35913 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756601Ab2GKH1B (ORCPT ); Wed, 11 Jul 2012 03:27:01 -0400 Received: by wibhr14 with SMTP id hr14so807533wib.1 for ; Wed, 11 Jul 2012 00:27:00 -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:x-mailer:in-reply-to:references; bh=Uiia36h70Fc3a9x+GNi3SZlLdJ3Ei5LiOLef4oXHzvo=; b=ryNfjV5Tfv6TFgXyCWVCvjtwfGzIkzE61PeT7hVv2j0Ep9ITErtClEl4t6DOBM1UUo Je1nMtAbyvQaf7wMot2/E1NS+MXULIR3F4CW5SAXMT07luA32d5pKojCKVbtJHTGyZyB OotMca/JPMwTNmrk5VvOyfl3z2HNNRZ7nHXWx8oV4m32T47XTdMQl6NUq5eu3Kl8N50J fFZCnmVwyWOrD17qdlXqoHvr41AOXaY/+k88c7hddsl0i5IVt258yQUmKIHOxUeboBbH J5SJXTQjDqRaSomZDHr/SIEMvd9IHAaYobMm/ahxRO5O9c94Uy7W/KDuPQVCCN7NMZJr 3biw== Received: by 10.216.95.10 with SMTP id o10mr6244900wef.213.1341991620016; Wed, 11 Jul 2012 00:27:00 -0700 (PDT) Received: from localhost.localdomain ([91.213.169.4]) by mx.google.com with ESMTPS id t7sm3040238wix.6.2012.07.11.00.26.57 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Jul 2012 00:26:59 -0700 (PDT) From: Alexander Smirnov To: davem@davemloft.net, eric.dumazet@gmail.com Cc: netdev@vger.kernel.org, Alexander Smirnov Subject: [PATCH net-next v2 4/7] 6lowpan: get extra headroom in allocated frame Date: Wed, 11 Jul 2012 11:22:45 +0400 Message-Id: <1341991368-11800-5-git-send-email-alex.bluesman.smirnov@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1341991368-11800-1-git-send-email-alex.bluesman.smirnov@gmail.com> References: <1341991368-11800-1-git-send-email-alex.bluesman.smirnov@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use netdev_alloc_skb_ip_align() instead of alloc_skb() to get some extra headroom in case we need to forward this frame in a tunnel or something else. Signed-off-by: Alexander Smirnov --- net/ieee802154/6lowpan.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c index b872515..ae3f4eb 100644 --- a/net/ieee802154/6lowpan.c +++ b/net/ieee802154/6lowpan.c @@ -661,8 +661,8 @@ lowpan_alloc_new_frame(struct sk_buff *skb, u8 iphc0, u8 len, u8 tag) frame->tag = tag; /* allocate buffer for frame assembling */ - frame->skb = alloc_skb(frame->length + - sizeof(struct ipv6hdr), GFP_ATOMIC); + frame->skb = netdev_alloc_skb_ip_align(skb->dev, frame->length + + sizeof(struct ipv6hdr)); if (!frame->skb) goto skb_err;