1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index d5334b41e4b4..99eed9f37c84 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -232,7 +232,7 @@ static int macvlan_open(struct net_device *dev)
         if (macvlan_addr_busy(vlan->port, dev->dev_addr))
                 goto out;
 
-        err = dev_unicast_add(lowerdev, dev->dev_addr, ETH_ALEN);
+        err = dev_unicast_add(lowerdev, dev->dev_addr);
         if (err < 0)
                 goto out;
         if (dev->flags & IFF_ALLMULTI) {
@@ -244,7 +244,7 @@ static int macvlan_open(struct net_device *dev)
         return 0;
 
 del_unicast:
-        dev_unicast_delete(lowerdev, dev->dev_addr, ETH_ALEN);
+        dev_unicast_delete(lowerdev, dev->dev_addr);
 out:
         return err;
 }
@@ -258,7 +258,7 @@ static int macvlan_stop(struct net_device *dev)
         if (dev->flags & IFF_ALLMULTI)
                 dev_set_allmulti(lowerdev, -1);
 
-        dev_unicast_delete(lowerdev, dev->dev_addr, ETH_ALEN);
+        dev_unicast_delete(lowerdev, dev->dev_addr);
 
         macvlan_hash_del(vlan);
         return 0;
@@ -282,10 +282,11 @@ static int macvlan_set_mac_address(struct net_device *dev, void *p)
                 if (macvlan_addr_busy(vlan->port, addr->sa_data))
                         return -EBUSY;
 
-                if ((err = dev_unicast_add(lowerdev, addr->sa_data, ETH_ALEN)))
+                err = dev_unicast_add(lowerdev, addr->sa_data);
+                if (err)
                         return err;
 
-                dev_unicast_delete(lowerdev, dev->dev_addr, ETH_ALEN);
+                dev_unicast_delete(lowerdev, dev->dev_addr);
 
                 macvlan_hash_change_addr(vlan, addr->sa_data);
         }
@@ -358,6 +359,7 @@ static int macvlan_init(struct net_device *dev)
                                   (lowerdev->state & MACVLAN_STATE_MASK);
         dev->features           = lowerdev->features & MACVLAN_FEATURES;
         dev->iflink             = lowerdev->ifindex;
+        dev->hard_header_len    = lowerdev->hard_header_len;
 
         macvlan_set_lockdep_class(dev);