aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/apple
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/apple')
-rw-r--r--drivers/net/ethernet/apple/mace.c4
-rw-r--r--drivers/net/ethernet/apple/macmace.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/apple/mace.c b/drivers/net/ethernet/apple/mace.c
index bd5555dbe027..06998462e0d3 100644
--- a/drivers/net/ethernet/apple/mace.c
+++ b/drivers/net/ethernet/apple/mace.c
@@ -444,7 +444,7 @@ static int mace_open(struct net_device *dev)
444 memset((char *)mp->rx_cmds, 0, N_RX_RING * sizeof(struct dbdma_cmd)); 444 memset((char *)mp->rx_cmds, 0, N_RX_RING * sizeof(struct dbdma_cmd));
445 cp = mp->rx_cmds; 445 cp = mp->rx_cmds;
446 for (i = 0; i < N_RX_RING - 1; ++i) { 446 for (i = 0; i < N_RX_RING - 1; ++i) {
447 skb = dev_alloc_skb(RX_BUFLEN + 2); 447 skb = netdev_alloc_skb(dev, RX_BUFLEN + 2);
448 if (!skb) { 448 if (!skb) {
449 data = dummy_buf; 449 data = dummy_buf;
450 } else { 450 } else {
@@ -956,7 +956,7 @@ static irqreturn_t mace_rxdma_intr(int irq, void *dev_id)
956 cp = mp->rx_cmds + i; 956 cp = mp->rx_cmds + i;
957 skb = mp->rx_bufs[i]; 957 skb = mp->rx_bufs[i];
958 if (!skb) { 958 if (!skb) {
959 skb = dev_alloc_skb(RX_BUFLEN + 2); 959 skb = netdev_alloc_skb(RX_BUFLEN + 2);
960 if (skb) { 960 if (skb) {
961 skb_reserve(skb, 2); 961 skb_reserve(skb, 2);
962 mp->rx_bufs[i] = skb; 962 mp->rx_bufs[i] = skb;
diff --git a/drivers/net/ethernet/apple/macmace.c b/drivers/net/ethernet/apple/macmace.c
index 7cf81bbffe0e..ab7ff8645ab1 100644
--- a/drivers/net/ethernet/apple/macmace.c
+++ b/drivers/net/ethernet/apple/macmace.c
@@ -661,7 +661,7 @@ static void mace_dma_rx_frame(struct net_device *dev, struct mace_frame *mf)
661 } else { 661 } else {
662 unsigned int frame_length = mf->rcvcnt + ((frame_status & 0x0F) << 8 ); 662 unsigned int frame_length = mf->rcvcnt + ((frame_status & 0x0F) << 8 );
663 663
664 skb = dev_alloc_skb(frame_length + 2); 664 skb = netdev_alloc_skb(dev, frame_length + 2);
665 if (!skb) { 665 if (!skb) {
666 dev->stats.rx_dropped++; 666 dev->stats.rx_dropped++;
667 return; 667 return;