2 files changed, 3 insertions, 4 deletions

diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 3a683006d761..5b24c65b13c6 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -591,8 +591,7 @@ struct sk_buff *arp_create(int type, int ptype, __be32 dest_ip,
         /*
          *      Fill the device header for the ARP frame
          */
-        if (dev->hard_header &&
-            dev->hard_header(skb,dev,ptype,dest_hw,src_hw,skb->len) < 0)
+        if (dev_hard_header(skb, dev, ptype, dest_hw, src_hw, skb->len) < 0)
                 goto out;
 
         /*
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index af5d5b39fc13..c5c107a01823 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -757,8 +757,8 @@ static void __init ic_bootp_send_if(struct ic_device *d, unsigned long jiffies_d
         /* Chain packet down the line... */
         skb->dev = dev;
         skb->protocol = htons(ETH_P_IP);
-        if ((dev->hard_header &&
-             dev->hard_header(skb, dev, ntohs(skb->protocol), dev->broadcast, dev->dev_addr, skb->len) < 0) ||
+        if (dev_hard_header(skb, dev, ntohs(skb->protocol),
+                            dev->broadcast, dev->dev_addr, skb->len) < 0 ||
             dev_queue_xmit(skb) < 0)
                 printk("E");
 }