net: Use netdev_alloc_skb_ip_align()

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 3 insertions, 11 deletions

diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index 00569dc1313c..963df502260a 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -1864,21 +1864,14 @@ static u16 atl1_alloc_rx_buffers(struct atl1_adapter *adapter)
 
                 rfd_desc = ATL1_RFD_DESC(rfd_ring, rfd_next_to_use);
 
-                skb = netdev_alloc_skb(adapter->netdev,
-                                       adapter->rx_buffer_len + NET_IP_ALIGN);
+                skb = netdev_alloc_skb_ip_align(adapter->netdev,
+                                                adapter->rx_buffer_len);
                 if (unlikely(!skb)) {
                         /* Better luck next round */
                         adapter->netdev->stats.rx_dropped++;
                         break;
                 }
 
-                /*
-                 * Make buffer alignment 2 beyond a 16 byte boundary
-                 * this will result in a 16 byte aligned IP header after
-                 * the 14 byte MAC header is removed
-                 */
-                skb_reserve(skb, NET_IP_ALIGN);
-
                 buffer_info->alloced = 1;
                 buffer_info->skb = skb;
                 buffer_info->length = (u16) adapter->rx_buffer_len;
diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c
index ab688862093f..0d268075bad5 100644
--- a/drivers/net/atlx/atl2.c
+++ b/drivers/net/atlx/atl2.c
@@ -409,7 +409,7 @@ static void atl2_intr_rx(struct atl2_adapter *adapter)
                 if (rxd->status.ok && rxd->status.pkt_size >= 60) {
                         int rx_size = (int)(rxd->status.pkt_size - 4);
                         /* alloc new buffer */
-                        skb = netdev_alloc_skb(netdev, rx_size + NET_IP_ALIGN);
+                        skb = netdev_alloc_skb_ip_align(netdev, rx_size);
                         if (NULL == skb) {
                                 printk(KERN_WARNING
                                         "%s: Mem squeeze, deferring packet.\n",
@@ -421,7 +421,6 @@ static void atl2_intr_rx(struct atl2_adapter *adapter)
                                 netdev->stats.rx_dropped++;
                                 break;
                         }
-                        skb_reserve(skb, NET_IP_ALIGN);
                         skb->dev = netdev;
                         memcpy(skb->data, rxd->packet, rx_size);
                         skb_put(skb, rx_size);