1 files changed, 11 insertions, 24 deletions

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 214a8cf2b708..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);
 
@@ -374,36 +376,20 @@ static void macvlan_ethtool_get_drvinfo(struct net_device *dev,
 static u32 macvlan_ethtool_get_rx_csum(struct net_device *dev)
 {
         const struct macvlan_dev *vlan = netdev_priv(dev);
-        struct net_device *lowerdev = vlan->lowerdev;
-
-        if (lowerdev->ethtool_ops == NULL ||
-            lowerdev->ethtool_ops->get_rx_csum == NULL)
-                return 0;
-        return lowerdev->ethtool_ops->get_rx_csum(lowerdev);
+        return dev_ethtool_get_rx_csum(vlan->lowerdev);
 }
 
 static int macvlan_ethtool_get_settings(struct net_device *dev,
                                         struct ethtool_cmd *cmd)
 {
         const struct macvlan_dev *vlan = netdev_priv(dev);
-        struct net_device *lowerdev = vlan->lowerdev;
-
-        if (!lowerdev->ethtool_ops ||
-            !lowerdev->ethtool_ops->get_settings)
-                return -EOPNOTSUPP;
-
-        return lowerdev->ethtool_ops->get_settings(lowerdev, cmd);
+        return dev_ethtool_get_settings(vlan->lowerdev, cmd);
 }
 
 static u32 macvlan_ethtool_get_flags(struct net_device *dev)
 {
         const struct macvlan_dev *vlan = netdev_priv(dev);
-        struct net_device *lowerdev = vlan->lowerdev;
-
-        if (!lowerdev->ethtool_ops ||
-            !lowerdev->ethtool_ops->get_flags)
-                return 0;
-        return lowerdev->ethtool_ops->get_flags(lowerdev);
+        return dev_ethtool_get_flags(vlan->lowerdev);
 }
 
 static const struct ethtool_ops macvlan_ethtool_ops = {
@@ -430,6 +416,7 @@ static void macvlan_setup(struct net_device *dev)
 {
         ether_setup(dev);
 
+        dev->priv_flags        &= ~IFF_XMIT_DST_RELEASE;
         dev->netdev_ops         = &macvlan_netdev_ops;
         dev->destructor         = free_netdev;
         dev->header_ops         = &macvlan_hard_header_ops,