瀏覽代碼

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>
Maciej W. Rozycki 11 年之前
父節點
當前提交
a630be7077
共有 1 個文件被更改,包括 6 次插入2 次删除
  1. 6 2
      drivers/net/fddi/defxx.c

+ 6 - 2
drivers/net/fddi/defxx.c

@@ -3045,7 +3045,8 @@ static void dfx_rcv_queue_process(
 				if (pkt_len > SKBUFF_RX_COPYBREAK) {
 				if (pkt_len > SKBUFF_RX_COPYBREAK) {
 					struct sk_buff *newskb;
 					struct sk_buff *newskb;
 
 
-					newskb = dev_alloc_skb(NEW_SKB_SIZE);
+					newskb = netdev_alloc_skb(bp->dev,
+								  NEW_SKB_SIZE);
 					if (newskb){
 					if (newskb){
 						rx_in_place = 1;
 						rx_in_place = 1;
 
 
@@ -3066,7 +3067,10 @@ static void dfx_rcv_queue_process(
 						skb = NULL;
 						skb = NULL;
 				} else
 				} else
 #endif
 #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)
 				if (skb == NULL)
 					{
 					{
 					printk("%s: Could not allocate receive buffer.  Dropping packet.\n", bp->dev->name);
 					printk("%s: Could not allocate receive buffer.  Dropping packet.\n", bp->dev->name);