netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Maciej W. Rozycki" <macro@linux-mips.org>
To: netdev@vger.kernel.org
Cc: Robert Coerver <Robert.Coerver@ll.mit.edu>
Subject: [PATCH 3/5] defxx: Use netdev_alloc_skb consistently
Date: Sat, 5 Jul 2014 15:14:36 +0100 (BST)	[thread overview]
Message-ID: <alpine.LFD.2.11.1407020559470.15455@eddie.linux-mips.org> (raw)
In-Reply-To: <alpine.LFD.2.11.1407020439490.15455@eddie.linux-mips.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 <Robert.Coerver@ll.mit.edu>
Tested-by: Robert Coerver <Robert.Coerver@ll.mit.edu>
Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
---
 Please apply,

  Maciej

linux-defxx-netdev-alloc-skb.patch
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);

  parent reply	other threads:[~2014-07-05 14:14 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-05 14:14 [PATCH 0/5] defxx: Fixes for 64-bit host support Maciej W. Rozycki
2014-07-05 14:14 ` [PATCH 1/5] defxx: Correct the receive DMA map size Maciej W. Rozycki
2014-07-05 14:14 ` [PATCH 2/5] defxx: Discard DMA maps on buffer deallocation Maciej W. Rozycki
2014-07-05 14:14 ` Maciej W. Rozycki [this message]
2014-07-05 14:14 ` [PATCH 4/5] defxx: Handle DMA mapping errors Maciej W. Rozycki
2014-07-05 14:14 ` [PATCH 5/5] defxx: Add missing DMA synchronisation calls Maciej W. Rozycki
2014-07-08 22:30 ` [PATCH 0/5] defxx: Fixes for 64-bit host support David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=alpine.LFD.2.11.1407020559470.15455@eddie.linux-mips.org \
    --to=macro@linux-mips.org \
    --cc=Robert.Coerver@ll.mit.edu \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).