From patchwork Wed Jan 25 18:46:28 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: 137824 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 23B9B1007D3 for ; Thu, 26 Jan 2012 05:47:18 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751366Ab2AYSrC (ORCPT ); Wed, 25 Jan 2012 13:47:02 -0500 Received: from mail-pw0-f46.google.com ([209.85.160.46]:64417 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750757Ab2AYSrA (ORCPT ); Wed, 25 Jan 2012 13:47:00 -0500 Received: by pbaa10 with SMTP id a10so12592pba.19 for ; Wed, 25 Jan 2012 10:47:00 -0800 (PST) MIME-Version: 1.0 Received: by 10.68.74.170 with SMTP id u10mr845382pbv.99.1327517220337; Wed, 25 Jan 2012 10:47:00 -0800 (PST) Received: from localhost.localdomain ([122.170.38.244]) by mx.google.com with ESMTPS id o7sm4416803pbq.8.2012.01.25.10.46.56 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 25 Jan 2012 10:46:59 -0800 (PST) From: "Pradeep A. Dalvi" To: netdev@vger.kernel.org Cc: "David S. Miller" , linux-kernel@vger.kernel.org, Eric Dumazet , "Pradeep A. Dalvi" Subject: [PATCH net] amd/lance.c: dev_alloc_skb to netdev_alloc_skb Date: Thu, 26 Jan 2012 00:16:28 +0530 Message-Id: <1327517188-14088-1-git-send-email-netdev@pradeepdalvi.com> X-Mailer: git-send-email 1.7.5.4 X-Gm-Message-State: ALoCoQklEK1mfbaUTMOgVmsd82AJ4iFxqf4MppyZs5SpYcBuklcduZ/CF7IS3Va31qGSSTEVOoU9 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Replaced deprecating dev_alloc_skb with netdev_alloc_skb for amd/lance.c - Removed extra skb->dev = dev Signed-off-by: Pradeep A. Dalvi --- drivers/net/ethernet/amd/lance.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 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/amd/lance.c b/drivers/net/ethernet/amd/lance.c index a6e2e84..a8a6b45 100644 --- a/drivers/net/ethernet/amd/lance.c +++ b/drivers/net/ethernet/amd/lance.c @@ -871,12 +871,11 @@ lance_init_ring(struct net_device *dev, gfp_t gfp) struct sk_buff *skb; void *rx_buff; - skb = alloc_skb(PKT_BUF_SZ, GFP_DMA | gfp); + skb = __netdev_alloc_skb(dev, PKT_BUF_SZ, GFP_DMA | gfp); lp->rx_skbuff[i] = skb; - if (skb) { - skb->dev = dev; + if (skb) rx_buff = skb->data; - } else + else rx_buff = kmalloc(PKT_BUF_SZ, GFP_DMA | gfp); if (rx_buff == NULL) lp->rx_ring[i].base = 0; @@ -1183,7 +1182,7 @@ lance_rx(struct net_device *dev) } else { - skb = dev_alloc_skb(pkt_len+2); + skb = netdev_alloc_skb(dev, pkt_len + 2); if (skb == NULL) { printk("%s: Memory squeeze, deferring packet.\n", dev->name);