[NET]: Wrap netdevice hardware header creation.

Add inline for common usage of hardware header creation, and
fix bug in IPV6 mcast where the assumption about negative return is
an errno. Negative return from hard_header means not enough space
was available,(ie -N bytes).

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 8 insertions, 8 deletions

diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index c05bc37df3..4bff23e3b9 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -286,7 +286,7 @@ static int bpq_xmit(struct sk_buff *skb, struct net_device *dev)
 
         skb->protocol = ax25_type_trans(skb, dev);
         skb_reset_network_header(skb);
-        dev->hard_header(skb, dev, ETH_P_BPQ, bpq->dest_addr, NULL, 0);
+        dev_hard_header(skb, dev, ETH_P_BPQ, bpq->dest_addr, NULL, 0);
         bpq->stats.tx_packets++;
         bpq->stats.tx_bytes+=skb->len;
   
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 2f6cdaa887..a22087ca96 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -170,8 +170,8 @@ static int macvlan_hard_header(struct sk_buff *skb, struct net_device *dev,
         const struct macvlan_dev *vlan = netdev_priv(dev);
         struct net_device *lowerdev = vlan->lowerdev;
 
-        return lowerdev->hard_header(skb, lowerdev, type, daddr,
-                                     saddr ? : dev->dev_addr, len);
+        return dev_hard_header(skb, lowerdev, type, daddr,
+                               saddr ? : dev->dev_addr, len);
 }
 
 static int macvlan_open(struct net_device *dev)
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index d48b7b73d8..8936ed3469 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -834,8 +834,8 @@ static int pppoe_sendmsg(struct kiocb *iocb, struct socket *sock,
         }
 
         error = total_len;
-        dev->hard_header(skb, dev, ETH_P_PPP_SES,
-                         po->pppoe_pa.remote, NULL, total_len);
+        dev_hard_header(skb, dev, ETH_P_PPP_SES,
+                        po->pppoe_pa.remote, NULL, total_len);
 
         memcpy(ph, &hdr, sizeof(struct pppoe_hdr));
 
@@ -886,8 +886,8 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb)
         skb->protocol = __constant_htons(ETH_P_PPP_SES);
         skb->dev = dev;
 
-        dev->hard_header(skb, dev, ETH_P_PPP_SES,
-                         po->pppoe_pa.remote, NULL, data_len);
+        dev_hard_header(skb, dev, ETH_P_PPP_SES,
+                        po->pppoe_pa.remote, NULL, data_len);
 
         dev_queue_xmit(skb);
 
diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c
index 36e683ccae..fb37b80952 100644
--- a/drivers/net/wan/lapbether.c
+++ b/drivers/net/wan/lapbether.c
@@ -216,7 +216,7 @@ static void lapbeth_data_transmit(struct net_device *ndev, struct sk_buff *skb)
 
         skb->dev = dev = lapbeth->ethdev;
 
-        dev->hard_header(skb, dev, ETH_P_DEC, bcast_addr, NULL, 0);
+        dev_hard_header(skb, dev, ETH_P_DEC, bcast_addr, NULL, 0);
 
         dev_queue_xmit(skb);
 }