From patchwork Sat Jul 5 14:14:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Maciej W. Rozycki" X-Patchwork-Id: 367317 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 5F32A14012A for ; Sun, 6 Jul 2014 00:14:42 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753694AbaGEOOi (ORCPT ); Sat, 5 Jul 2014 10:14:38 -0400 Received: from eddie.linux-mips.org ([78.24.191.182]:59876 "EHLO cvs.linux-mips.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753347AbaGEOOh (ORCPT ); Sat, 5 Jul 2014 10:14:37 -0400 Received: from localhost.localdomain ([127.0.0.1]:48341 "EHLO localhost.localdomain" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S6859971AbaGEOOgcPaEj (ORCPT ); Sat, 5 Jul 2014 16:14:36 +0200 Date: Sat, 5 Jul 2014 15:14:36 +0100 (BST) From: "Maciej W. Rozycki" To: netdev@vger.kernel.org cc: Robert Coerver Subject: [PATCH 3/5] defxx: Use netdev_alloc_skb consistently In-Reply-To: Message-ID: References: User-Agent: Alpine 2.11 (LFD 23 2013-08-11) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Switch the two remaining places across the driver that use dev_alloc_skb to netdev_alloc_skb. Another place has already been converted to use __netdev_alloc_skb, no idea why these two have been left behind. Reported-by: Robert Coerver Tested-by: Robert Coerver Signed-off-by: Maciej W. Rozycki --- Please apply, Maciej linux-defxx-netdev-alloc-skb.patch -- 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 Index: linux-20140623-swarm64-eb/drivers/net/fddi/defxx.c =================================================================== --- linux-20140623-swarm64-eb.orig/drivers/net/fddi/defxx.c +++ linux-20140623-swarm64-eb/drivers/net/fddi/defxx.c @@ -3049,7 +3049,8 @@ static void dfx_rcv_queue_process( if (pkt_len > SKBUFF_RX_COPYBREAK) { struct sk_buff *newskb; - newskb = dev_alloc_skb(NEW_SKB_SIZE); + newskb = netdev_alloc_skb(bp->dev, + NEW_SKB_SIZE); if (newskb){ rx_in_place = 1; @@ -3070,7 +3071,10 @@ static void dfx_rcv_queue_process( skb = NULL; } else #endif - skb = dev_alloc_skb(pkt_len+3); /* alloc new buffer to pass up, add room for PRH */ + /* Alloc new buffer to pass up, + * add room for PRH. */ + skb = netdev_alloc_skb(bp->dev, + pkt_len + 3); if (skb == NULL) { printk("%s: Could not allocate receive buffer. Dropping packet.\n", bp->dev->name);