1 files changed, 6 insertions, 3 deletions

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 47c908f1f626..4b65aa492fb6 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -61,7 +61,7 @@ static int vlan_dev_rebuild_header(struct sk_buff *skb)
                 pr_debug("%s: unable to resolve type %X addresses\n",
                          dev->name, ntohs(veth->h_vlan_encapsulated_proto));
 
-                memcpy(veth->h_source, dev->dev_addr, ETH_ALEN);
+                ether_addr_copy(veth->h_source, dev->dev_addr);
                 break;
         }
 
@@ -303,7 +303,7 @@ static int vlan_dev_open(struct net_device *dev)
                         goto clear_allmulti;
         }
 
-        memcpy(vlan->real_dev_addr, real_dev->dev_addr, ETH_ALEN);
+        ether_addr_copy(vlan->real_dev_addr, real_dev->dev_addr);
 
         if (vlan->flags & VLAN_FLAG_GVRP)
                 vlan_gvrp_request_join(dev);
@@ -367,7 +367,7 @@ static int vlan_dev_set_mac_address(struct net_device *dev, void *p)
                 dev_uc_del(real_dev, dev->dev_addr);
 
 out:
-        memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
+        ether_addr_copy(dev->dev_addr, addr->sa_data);
         return 0;
 }
 
@@ -538,6 +538,9 @@ static int vlan_passthru_hard_header(struct sk_buff *skb, struct net_device *dev
         struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
         struct net_device *real_dev = vlan->real_dev;
 
+        if (saddr == NULL)
+                saddr = dev->dev_addr;
+
         return dev_hard_header(skb, real_dev, type, daddr, saddr, len);
 }