diff --git a/[refs] b/[refs]
index 095162ebfa82..4654a48f7167 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a23c58a3ac4090a41e63ae5b69af87b409abe019
+refs/heads/master: 0a0d08aca5d0a77da4b66de289acfd891a3e72e1
diff --git a/trunk/drivers/net/wireless/libertas/main.c b/trunk/drivers/net/wireless/libertas/main.c
index e56916a46821..5dde49bbda85 100644
--- a/trunk/drivers/net/wireless/libertas/main.c
+++ b/trunk/drivers/net/wireless/libertas/main.c
@@ -465,6 +465,9 @@ static int wlan_set_mac_address(struct net_device *dev, void *addr)
 
 	lbs_deb_enter(LBS_DEB_NET);
 
+	/* In case it was called from the mesh device */
+	dev = priv->dev ;
+
 	memset(adapter->current_addr, 0, ETH_ALEN);
 
 	/* dev->dev_addr is 8 bytes */
@@ -914,6 +917,7 @@ int libertas_add_mesh(wlan_private *priv, struct device *dev)
 	mesh_dev->stop = mesh_close;
 	mesh_dev->do_ioctl = libertas_do_ioctl;
 	mesh_dev->get_stats = wlan_get_stats;
+	mesh_dev->set_mac_address = wlan_set_mac_address;
 	mesh_dev->ethtool_ops = &libertas_ethtool_ops;
 	memcpy(mesh_dev->dev_addr, priv->dev->dev_addr,
 			sizeof(priv->dev->dev_addr));