From patchwork Wed Feb 8 10:03:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Pradeep A. Dalvi" X-Patchwork-Id: 140101 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 C458AB71A8 for ; Wed, 8 Feb 2012 21:04:49 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753773Ab2BHKEW (ORCPT ); Wed, 8 Feb 2012 05:04:22 -0500 Received: from mail-pw0-f46.google.com ([209.85.160.46]:60171 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751503Ab2BHKEV (ORCPT ); Wed, 8 Feb 2012 05:04:21 -0500 Received: by pbcun15 with SMTP id un15so431727pbc.19 for ; Wed, 08 Feb 2012 02:04:21 -0800 (PST) Received: by 10.68.135.137 with SMTP id ps9mr66714415pbb.40.1328695461203; Wed, 08 Feb 2012 02:04:21 -0800 (PST) Received: from localhost.localdomain ([203.199.144.194]) by mx.google.com with ESMTPS id x6sm392000pbf.7.2012.02.08.02.04.17 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 08 Feb 2012 02:04:20 -0800 (PST) From: Pradeep A Dalvi To: netdev@vger.kernel.org Cc: "David S. Miller" , linux-kernel@vger.kernel.org, Pradeep A Dalvi Subject: [PATCH net-next] mace: Fix build for mace due to netdev_alloc_skb Date: Wed, 8 Feb 2012 15:33:15 +0530 Message-Id: <1328695395-2565-1-git-send-email-netdev@pradeepdalvi.com> X-Mailer: git-send-email 1.7.5.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Refs: 1. pmac32_defconfig http://kisskb.ellerman.id.au/kisskb/buildresult/5583746/ 2. ppc6xx_defconfig http://kisskb.ellerman.id.au/kisskb/buildresult/5584116/ Confirmed any such occurances from all failed defconfigs & in net-next sources with grep -nrs "netdev_alloc_skb" drivers/net/ethernet/ | grep -v "," Reported-by: Geert Uytterhoeven Signed-off-by: Pradeep A Dalvi --- drivers/net/ethernet/apple/mace.c | 2 +- 1 files changed, 1 insertions(+), 1 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/ethernet/apple/mace.c b/drivers/net/ethernet/apple/mace.c index 0699846..e1df4b7 100644 --- a/drivers/net/ethernet/apple/mace.c +++ b/drivers/net/ethernet/apple/mace.c @@ -956,7 +956,7 @@ static irqreturn_t mace_rxdma_intr(int irq, void *dev_id) cp = mp->rx_cmds + i; skb = mp->rx_bufs[i]; if (!skb) { - skb = netdev_alloc_skb(RX_BUFLEN + 2); + skb = netdev_alloc_skb(dev, RX_BUFLEN + 2); if (skb) { skb_reserve(skb, 2); mp->rx_bufs[i] = skb;