1 files changed, 2 insertions, 7 deletions

diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c
index 9f7b5d4172b8..ba8d246d05a0 100644
--- a/drivers/net/ipg.c
+++ b/drivers/net/ipg.c
@@ -738,17 +738,12 @@ static int ipg_get_rxbuff(struct net_device *dev, int entry)
 
         IPG_DEBUG_MSG("_get_rxbuff\n");
 
-        skb = netdev_alloc_skb(dev, sp->rxsupport_size + NET_IP_ALIGN);
+        skb = netdev_alloc_skb_ip_align(dev, sp->rxsupport_size);
         if (!skb) {
                 sp->rx_buff[entry] = NULL;
                 return -ENOMEM;
         }
 
-        /* Adjust the data start location within the buffer to
-         * align IP address field to a 16 byte boundary.
-         */
-        skb_reserve(skb, NET_IP_ALIGN);
-
         /* Associate the receive buffer with the IPG NIC. */
         skb->dev = dev;
 
@@ -1756,7 +1751,7 @@ static int ipg_nic_open(struct net_device *dev)
         /* Register the interrupt line to be used by the IPG within
          * the Linux system.
          */
-        rc = request_irq(pdev->irq, &ipg_interrupt_handler, IRQF_SHARED,
+        rc = request_irq(pdev->irq, ipg_interrupt_handler, IRQF_SHARED,
                          dev->name, dev);
         if (rc < 0) {
                 printk(KERN_INFO "%s: Error when requesting interrupt.\n",