Index: /trunk/batman-adv-kernelland/soft-interface.c
===================================================================
--- /trunk/batman-adv-kernelland/soft-interface.c (revision 1551)
+++ /trunk/batman-adv-kernelland/soft-interface.c (revision 1578)
@@ -155,7 +155,11 @@
 		return -EADDRNOTAVAIL;
 
-	hna_local_remove(dev->dev_addr, "mac address changed");
+	/* only modify hna-table if it has been initialised before */
+	if (atomic_read(&module_state) == MODULE_ACTIVE) {
+		hna_local_remove(dev->dev_addr, "mac address changed");
+		hna_local_add(addr->sa_data);
+	}
+
 	memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
-	hna_local_add(dev->dev_addr);
 
 	return 0;