drivers/net: request_irq - Remove unnecessary leading & from second arg

[deliverable/linux.git] / drivers / net / atlx / atl1.c

diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index 00569dc1313cd5c2a1f7ead4603ac8deb7bec4ff..e547f788a2660c4d22e7c11ad3ae2d4f6a076cb2 100644 (file)
--- 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;
@@ -2596,7 +2589,7 @@ static s32 atl1_up(struct atl1_adapter *adapter)
                irq_flags |= IRQF_SHARED;
        }
 
-       err = request_irq(adapter->pdev->irq, &atl1_intr, irq_flags,
+       err = request_irq(adapter->pdev->irq, atl1_intr, irq_flags,
                        netdev->name, netdev);
        if (unlikely(err))
                goto err_up;