ethernet/realtek: use napi_alloc_skb instead of netdev_alloc_skb_ip_align

This replaces most of the calls to netdev_alloc_skb_ip_align in the Realtek
drivers.  The one instance I didn't replace in 8139cp.c is because it was
called as a part of init and as such is not always accessed from the
softirq context.

Cc: Realtek linux nic maintainers <nic_swsd@realtek.com>
Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
index 75b1693ec8bf..9c31e46d1eee 100644
--- a/drivers/net/ethernet/realtek/8139cp.c
+++ b/drivers/net/ethernet/realtek/8139cp.c
@@ -507,7 +507,7 @@ rx_status_loop:
                 netif_dbg(cp, rx_status, dev, "rx slot %d status 0x%x len %d\n",
                           rx_tail, status, len);
 
-                new_skb = netdev_alloc_skb_ip_align(dev, buflen);
+                new_skb = napi_alloc_skb(napi, buflen);
                 if (!new_skb) {
                         dev->stats.rx_dropped++;
                         goto rx_next;
diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c
index 63dc0f95d050..6d0b9dfac313 100644
--- a/drivers/net/ethernet/realtek/8139too.c
+++ b/drivers/net/ethernet/realtek/8139too.c
@@ -2037,7 +2037,7 @@ keep_pkt:
                 /* Malloc up new buffer, compatible with net-2e. */
                 /* Omit the four octet CRC from the length. */
 
-                skb = netdev_alloc_skb_ip_align(dev, pkt_size);
+                skb = napi_alloc_skb(&tp->napi, pkt_size);
                 if (likely(skb)) {
 #if RX_BUF_IDX == 3
                         wrap_copy(skb, rx_ring, ring_offset+4, pkt_size);
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index b9c2f33b463d..3dad7e884952 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -7260,7 +7260,7 @@ static struct sk_buff *rtl8169_try_rx_copy(void *data,
         data = rtl8169_align(data);
         dma_sync_single_for_cpu(d, addr, pkt_size, DMA_FROM_DEVICE);
         prefetch(data);
-        skb = netdev_alloc_skb_ip_align(tp->dev, pkt_size);
+        skb = napi_alloc_skb(&tp->napi, pkt_size);
         if (skb)
                 memcpy(skb->data, data, pkt_size);
         dma_sync_single_for_device(d, addr, pkt_size, DMA_FROM_DEVICE);