1 files changed, 12 insertions, 3 deletions

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index a22087ca968d..b7c81c874f7a 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -164,8 +164,8 @@ static int macvlan_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 }
 
 static int macvlan_hard_header(struct sk_buff *skb, struct net_device *dev,
-                               unsigned short type, void *daddr, void *saddr,
-                               unsigned len)
+                               unsigned short type, const void *daddr,
+                               const void *saddr, unsigned len)
 {
         const struct macvlan_dev *vlan = netdev_priv(dev);
         struct net_device *lowerdev = vlan->lowerdev;
@@ -174,6 +174,15 @@ static int macvlan_hard_header(struct sk_buff *skb, struct net_device *dev,
                                saddr ? : dev->dev_addr, len);
 }
 
+static const struct header_ops macvlan_hard_header_ops = {
+        .create         = macvlan_hard_header,
+        .rebuild        = eth_rebuild_header,
+        .parse          = eth_header_parse,
+        .rebuild        = eth_rebuild_header,
+        .cache          = eth_header_cache,
+        .cache_update   = eth_header_cache_update,
+};
+
 static int macvlan_open(struct net_device *dev)
 {
         struct macvlan_dev *vlan = netdev_priv(dev);
@@ -295,9 +304,9 @@ static void macvlan_setup(struct net_device *dev)
         dev->change_mtu         = macvlan_change_mtu;
         dev->change_rx_flags    = macvlan_change_rx_flags;
         dev->set_multicast_list = macvlan_set_multicast_list;
-        dev->hard_header        = macvlan_hard_header;
         dev->hard_start_xmit    = macvlan_hard_start_xmit;
         dev->destructor         = free_netdev;
+        dev->header_ops         = &macvlan_hard_header_ops,
         dev->ethtool_ops        = &macvlan_ethtool_ops;
         dev->tx_queue_len       = 0;
 }