Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...

[sfrench/cifs-2.6.git] / drivers / net / atlx / atl2.c

diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c
index ab688862093f41c7642c5a43b7f9b3262efbe7ce..c0451d75cdcf56d52ec5ae9be0ce0f9206aede5d 100644 (file)
--- 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);
@@ -652,7 +651,7 @@ static int atl2_request_irq(struct atl2_adapter *adapter)
        if (adapter->have_msi)
                flags &= ~IRQF_SHARED;
 
-       return request_irq(adapter->pdev->irq, &atl2_intr, flags, netdev->name,
+       return request_irq(adapter->pdev->irq, atl2_intr, flags, netdev->name,
                netdev);
 }