From patchwork Mon Jul 9 10:22:30 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: 169749 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 081072C031A for ; Mon, 9 Jul 2012 20:27:04 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753060Ab2GIK0r (ORCPT ); Mon, 9 Jul 2012 06:26:47 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:33420 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753045Ab2GIK0o (ORCPT ); Mon, 9 Jul 2012 06:26:44 -0400 Received: by mail-bk0-f46.google.com with SMTP id j10so5787740bkw.19 for ; Mon, 09 Jul 2012 03:26:44 -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=e1NX3JHwCGN5DPErEHOjh+vME5o6uVzqkCN4ctRzKo4=; b=Pds1mpIZjSstpx9lQSpqxPQQBqAXdLA/NtNTNdGP8rY549/6QlvgxoCqI9ddKyTJ88 cYT+cddWuShpgV/wWBeVhmX9r3vRlypojf99t3uuWpoWrEBKuDecKvjvaNlympO83VGi rN3ukI1cLmCgoeARgktg7AHbspDmyiNjMWGmFZRILy+dd/oBTArniZQJIHbZaJO167Bd iHY/zgc5zB5P6FoRiKUtEpNrNsfBj5JA47L9VrO4L/Jng4ooPeCdam3pHoczb/VamGHM 5wGSkZcEj/tfoaho4ekKaU7IGiZIu9BGUno81uRUe+XesP273pYwBUdNUASky+iQl8AF IAig== Received: by 10.204.154.141 with SMTP id o13mr15060244bkw.72.1341829604160; Mon, 09 Jul 2012 03:26:44 -0700 (PDT) Received: from localhost.localdomain ([91.213.169.4]) by mx.google.com with ESMTPS id g6sm2416025bkg.2.2012.07.09.03.26.42 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 09 Jul 2012 03:26:43 -0700 (PDT) From: Alexander Smirnov To: davem@davemloft.net, eric.dumazet@gmail.com Cc: netdev@vger.kernel.org, Alexander Smirnov Subject: [PATCH net-next 5/6] 6lowpan: get extra headroom in allocated frame Date: Mon, 9 Jul 2012 14:22:30 +0400 Message-Id: <1341829351-18485-6-git-send-email-alex.bluesman.smirnov@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1341829351-18485-1-git-send-email-alex.bluesman.smirnov@gmail.com> References: <1341829351-18485-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 e7de085..90ca7ba 100644 --- a/net/ieee802154/6lowpan.c +++ b/net/ieee802154/6lowpan.c @@ -660,8 +660,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;