aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/fddi/defxx.c
diff options
context:
space:
mode:
authorMaciej W. Rozycki <macro@linux-mips.org>2014-07-05 15:14:36 +0100
committerDavid S. Miller <davem@davemloft.net>2014-07-08 15:30:11 -0700
commita630be70771ddbe8253f619ac4b9ca4c3277b13b (patch)
tree9492dc4f1224749bac89f72e043bcd5eb706b876 /drivers/net/fddi/defxx.c
parentdefxx: Discard DMA maps on buffer deallocation (diff)
downloadlinux-dev-a630be70771ddbe8253f619ac4b9ca4c3277b13b.tar.xz
linux-dev-a630be70771ddbe8253f619ac4b9ca4c3277b13b.zip
defxx: Use netdev_alloc_skb consistently
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> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/fddi/defxx.c')
-rw-r--r--drivers/net/fddi/defxx.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/fddi/defxx.c b/drivers/net/fddi/defxx.c
index 0b2e80940b95..4c5a2fe67dfb 100644
--- a/drivers/net/fddi/defxx.c
+++ b/drivers/net/fddi/defxx.c
@@ -3045,7 +3045,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;
@@ -3066,7 +3067,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);