Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[karo-tx-linux.git] / net / hsr / hsr_main.c

diff --git a/net/hsr/hsr_main.c b/net/hsr/hsr_main.c
index af68dd83a4e3df0ed12b18d5361d436fa3edd9f6..3fee5218a691f20c8b028e7ed2738febc7dfd0b7 100644 (file)
--- a/net/hsr/hsr_main.c
+++ b/net/hsr/hsr_main.c
@@ -138,8 +138,8 @@ static int hsr_netdev_notify(struct notifier_block *nb, unsigned long event,
                        break;
 
                if (dev == hsr_priv->slave[0])
-                       memcpy(hsr_priv->dev->dev_addr,
-                              hsr_priv->slave[0]->dev_addr, ETH_ALEN);
+                       ether_addr_copy(hsr_priv->dev->dev_addr,
+                                       hsr_priv->slave[0]->dev_addr);
 
                /* Make sure we recognize frames from ourselves in hsr_rcv() */
                res = hsr_create_self_node(&hsr_priv->self_node_db,
@@ -459,7 +459,7 @@ static int __init hsr_init(void)
 static void __exit hsr_exit(void)
 {
        unregister_netdevice_notifier(&hsr_nb);
-       del_timer(&prune_timer);
+       del_timer_sync(&prune_timer);
        hsr_netlink_exit();
        dev_remove_pack(&hsr_pt);
 }