From fbaab51074994aad471b9b8a51a5a4b980fbeafe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20L=C3=BCssing?= Date: Fri, 7 May 2010 21:47:06 +0200 Subject: [PATCH] --- yaml --- r: 197348 b: refs/heads/master c: adaaa0c6ab89e82684389b80002bce893179cf2c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/batman-adv/soft-interface.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 87314b0ce03b..d99430935d75 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de37cd49b5a54facef174cf34496919857436e8f +refs/heads/master: adaaa0c6ab89e82684389b80002bce893179cf2c diff --git a/trunk/drivers/staging/batman-adv/soft-interface.c b/trunk/drivers/staging/batman-adv/soft-interface.c index 0e2307f3cb96..a42b21f40192 100644 --- a/trunk/drivers/staging/batman-adv/soft-interface.c +++ b/trunk/drivers/staging/batman-adv/soft-interface.c @@ -152,9 +152,13 @@ int interface_set_mac_addr(struct net_device *dev, void *p) if (!is_valid_ether_addr(addr->sa_data)) 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; }