From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752880Ab2AWJpc (ORCPT ); Mon, 23 Jan 2012 04:45:32 -0500 Received: from mail-lpp01m010-f46.google.com ([209.85.215.46]:44358 "EHLO mail-lpp01m010-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752227Ab2AWJpa (ORCPT ); Mon, 23 Jan 2012 04:45:30 -0500 Message-ID: <1327311925.2525.7.camel@edumazet-HP-Compaq-6005-Pro-SFF-PC> Subject: Re: [PATCH] netdev/ethernet: dev_alloc_skb to netdev_alloc_skb From: Eric Dumazet To: "Pradeep A. Dalvi" Cc: netdev@vger.kernel.org, "David S. Miller" , Christoph Hellwig , linux-kernel@vger.kernel.org Date: Mon, 23 Jan 2012 10:45:25 +0100 In-Reply-To: <1327179463-13980-1-git-send-email-netdev@pradeepdalvi.com> References: <1327179463-13980-1-git-send-email-netdev@pradeepdalvi.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.1- Content-Transfer-Encoding: 8bit Mime-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Le dimanche 22 janvier 2012 à 02:27 +0530, Pradeep A. Dalvi a écrit : > Replaced deprecating dev_alloc_skb with netdev_alloc_skb in drivers/net/ethernet > ... > diff --git a/drivers/net/ethernet/3com/3c515.c b/drivers/net/ethernet/3com/3c515.c > index f67a5d3..68fd765 100644 > --- a/drivers/net/ethernet/3com/3c515.c > +++ b/drivers/net/ethernet/3com/3c515.c > @@ -826,7 +826,7 @@ static int corkscrew_open(struct net_device *dev) > vp->rx_ring[i].next = 0; > vp->rx_ring[i].status = 0; /* Clear complete bit. */ > vp->rx_ring[i].length = PKT_BUF_SZ | 0x80000000; > - skb = dev_alloc_skb(PKT_BUF_SZ); > + skb = netdev_alloc_skb(dev, PKT_BUF_SZ); > vp->rx_skbuff[i] = skb; > if (skb == NULL) > break; /* Bad news! */ One of the difference between netdev_alloc_skb() and dev_alloc_skb() is the former initializes skb->dev. So you should remove the extra "skb->dev = dev;" lines that sometimes are after the dev_alloc_skb() calls. [ They were redundant anyway because eth_type_trans() also sets skb->dev ]