From patchwork Sat May 29 23:23:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Sutter X-Patchwork-Id: 53990 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 41FA7B7D2F for ; Sun, 30 May 2010 09:24:04 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756203Ab0E2XXw (ORCPT ); Sat, 29 May 2010 19:23:52 -0400 Received: from orbit.nwl.cc ([91.121.169.95]:38227 "EHLO orbit.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754381Ab0E2XXt (ORCPT ); Sat, 29 May 2010 19:23:49 -0400 Received: from orbit.nwl.cc (localhost [127.0.0.1]) by orbit.nwl.cc (Postfix) with ESMTP id 46FD34CD58; Sun, 30 May 2010 01:23:48 +0200 (CEST) Received: from base (localhost [127.0.0.1]) by orbit.nwl.cc (Postfix) with ESMTP id 3179F4CD57; Sun, 30 May 2010 01:23:48 +0200 (CEST) From: Phil Sutter To: David Miller Cc: Florian Fainelli , netdev@vger.kernel.org Subject: [PATCH 2/3] korina: use netdev_alloc_skb_ip_align() here, too Date: Sun, 30 May 2010 01:23:35 +0200 X-Mailer: git-send-email 1.6.4.4 In-Reply-To: <1275175416-21267-1-git-send-email-phil@nwl.cc> References: <1275175416-21267-1-git-send-email-phil@nwl.cc> Message-Id: <20100529232348.3179F4CD57@orbit.nwl.cc> X-Virus-Scanned: ClamAV using ClamSMTP Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch completes commit 89d71a66c40d629e3b1285def543ab1425558cd5 which missed this spot, as it seems. Signed-off-by: Phil Sutter --- drivers/net/korina.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/net/korina.c b/drivers/net/korina.c index 13533f9..3e9b6b7 100644 --- a/drivers/net/korina.c +++ b/drivers/net/korina.c @@ -765,10 +765,9 @@ static int korina_alloc_ring(struct net_device *dev) /* Initialize the receive descriptors */ for (i = 0; i < KORINA_NUM_RDS; i++) { - skb = dev_alloc_skb(KORINA_RBSIZE + 2); + skb = netdev_alloc_skb_ip_align(dev, KORINA_RBSIZE); if (!skb) return -ENOMEM; - skb_reserve(skb, 2); lp->rx_skb[i] = skb; lp->rd_ring[i].control = DMA_DESC_IOD | DMA_COUNT(KORINA_RBSIZE);