]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
defxx: Use netdev_alloc_skb consistently
authorMaciej W. Rozycki <macro@linux-mips.org>
Sat, 5 Jul 2014 14:14:36 +0000 (15:14 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 8 Jul 2014 22:30:11 +0000 (15:30 -0700)
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>
drivers/net/fddi/defxx.c

index 0b2e80940b95aabf7325e6c6a894bc7130e5ad4c..4c5a2fe67dfb0b3a4f3f8356290501bd9c48a0dd 100644 (file)
@@ -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);