From: Luis Carlos Cobo Rus Date: Sat, 26 May 2007 03:05:27 +0000 (-0400) Subject: [PATCH] libertas: make mac address configuration work with mesh interface too X-Git-Tag: v2.6.22-rc5~44^2~2^2~13 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0a0d08aca5d0a77da4b66de289acfd891a3e72e1;p=~emulex%2Finfiniband.git [PATCH] libertas: make mac address configuration work with mesh interface too Signed-off-by: Luis Carlos Cobo Rus Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index e56916a4682..5dde49bbda8 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/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));