libertas: convert CMD_802_11_MAC_ADDRESS to a direct command

* directly call lbs_cmd_with_response()
* only overwrite priv->current_addr once the firmware call succeeded

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 9 insertions, 16 deletions

diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index dac72f7af701..d0e4c3b6deaa 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -531,34 +531,27 @@ static int lbs_set_mac_address(struct net_device *dev, void *addr)
         int ret = 0;
         struct lbs_private *priv = (struct lbs_private *) dev->priv;
         struct sockaddr *phwaddr = addr;
+        struct cmd_ds_802_11_mac_address cmd;
 
         lbs_deb_enter(LBS_DEB_NET);
 
         /* In case it was called from the mesh device */
-        dev = priv->dev ;
-
-        memset(priv->current_addr, 0, ETH_ALEN);
-
-        /* dev->dev_addr is 8 bytes */
-        lbs_deb_hex(LBS_DEB_NET, "dev->dev_addr", dev->dev_addr, ETH_ALEN);
-
-        lbs_deb_hex(LBS_DEB_NET, "addr", phwaddr->sa_data, ETH_ALEN);
-        memcpy(priv->current_addr, phwaddr->sa_data, ETH_ALEN);
+        dev = priv->dev;
 
-        ret = lbs_prepare_and_send_command(priv, CMD_802_11_MAC_ADDRESS,
-                                    CMD_ACT_SET,
-                                    CMD_OPTION_WAITFORRSP, 0, NULL);
+        cmd.hdr.size = cpu_to_le16(sizeof(cmd));
+        cmd.action = cpu_to_le16(CMD_ACT_SET);
+        memcpy(cmd.macadd, phwaddr->sa_data, ETH_ALEN);
 
+        ret = lbs_cmd_with_response(priv, CMD_802_11_MAC_ADDRESS, &cmd);
         if (ret) {
                 lbs_deb_net("set MAC address failed\n");
-                ret = -1;
                 goto done;
         }
 
-        lbs_deb_hex(LBS_DEB_NET, "priv->macaddr", priv->current_addr, ETH_ALEN);
-        memcpy(dev->dev_addr, priv->current_addr, ETH_ALEN);
+        memcpy(priv->current_addr, phwaddr->sa_data, ETH_ALEN);
+        memcpy(dev->dev_addr, phwaddr->sa_data, ETH_ALEN);
         if (priv->mesh_dev)
-                memcpy(priv->mesh_dev->dev_addr, priv->current_addr, ETH_ALEN);
+                memcpy(priv->mesh_dev->dev_addr, phwaddr->sa_data, ETH_ALEN);
 
 done:
         lbs_deb_leave_args(LBS_DEB_NET, "ret %d", ret);