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>

4 files changed, 11 insertions, 61 deletions

diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 44b918a6c219..d396a5f06666 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -953,29 +953,6 @@ static int lbs_cmd_reg_access(struct cmd_ds_command *cmdptr,
         return 0;
 }
 
-static int lbs_cmd_802_11_mac_address(struct lbs_private *priv,
-                                       struct cmd_ds_command *cmd,
-                                       u16 cmd_action)
-{
-
-        lbs_deb_enter(LBS_DEB_CMD);
-        cmd->command = cpu_to_le16(CMD_802_11_MAC_ADDRESS);
-        cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_mac_address) +
-                             S_DS_GEN);
-        cmd->result = 0;
-
-        cmd->params.macadd.action = cpu_to_le16(cmd_action);
-
-        if (cmd_action == CMD_ACT_SET) {
-                memcpy(cmd->params.macadd.macadd,
-                       priv->current_addr, ETH_ALEN);
-                lbs_deb_hex(LBS_DEB_CMD, "SET_CMD: MAC addr", priv->current_addr, 6);
-        }
-
-        lbs_deb_leave(LBS_DEB_CMD);
-        return 0;
-}
-
 static int lbs_cmd_802_11_eeprom_access(struct cmd_ds_command *cmd,
                                         void *pdata_buf)
 {
@@ -1435,10 +1412,6 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,
                 ret = lbs_cmd_80211_ad_hoc_stop(cmdptr);
                 break;
 
-        case CMD_802_11_MAC_ADDRESS:
-                ret = lbs_cmd_802_11_mac_address(priv, cmdptr, cmd_action);
-                break;
-
         case CMD_802_11_EEPROM_ACCESS:
                 ret = lbs_cmd_802_11_eeprom_access(cmdptr, pdata_buf);
                 break;
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index 9de9666d495b..c3b80c139d4f 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -188,19 +188,6 @@ static int lbs_ret_802_11_snmp_mib(struct lbs_private *priv,
         return 0;
 }
 
-static int lbs_ret_802_11_mac_address(struct lbs_private *priv,
-                                       struct cmd_ds_command *resp)
-{
-        struct cmd_ds_802_11_mac_address *macadd = &resp->params.macadd;
-
-        lbs_deb_enter(LBS_DEB_CMD);
-
-        memcpy(priv->current_addr, macadd->macadd, ETH_ALEN);
-
-        lbs_deb_enter(LBS_DEB_CMD);
-        return 0;
-}
-
 static int lbs_ret_802_11_rf_tx_power(struct lbs_private *priv,
                                        struct cmd_ds_command *resp)
 {
@@ -368,10 +355,6 @@ static inline int handle_cmd_response(struct lbs_private *priv,
                 ret = lbs_ret_802_11_rssi(priv, resp);
                 break;
 
-        case CMD_RET(CMD_802_11_MAC_ADDRESS):
-                ret = lbs_ret_802_11_mac_address(priv, resp);
-                break;
-
         case CMD_RET(CMD_802_11_AD_HOC_STOP):
                 ret = lbs_ret_80211_ad_hoc_stop(priv);
                 break;
diff --git a/drivers/net/wireless/libertas/hostcmd.h b/drivers/net/wireless/libertas/hostcmd.h
index b8e372007bb9..e56d0049f5fd 100644
--- a/drivers/net/wireless/libertas/hostcmd.h
+++ b/drivers/net/wireless/libertas/hostcmd.h
@@ -427,6 +427,8 @@ struct cmd_ds_802_11_rssi_rsp {
 };
 
 struct cmd_ds_802_11_mac_address {
+        struct cmd_header hdr;
+
         __le16 action;
         u8 macadd[ETH_ALEN];
 };
@@ -708,7 +710,6 @@ struct cmd_ds_command {
                 struct cmd_ds_802_11_rssi rssi;
                 struct cmd_ds_802_11_rssi_rsp rssirsp;
                 struct cmd_ds_802_11_disassociate dassociate;
-                struct cmd_ds_802_11_mac_address macadd;
                 struct cmd_ds_mac_reg_access macreg;
                 struct cmd_ds_bbp_reg_access bbpreg;
                 struct cmd_ds_rf_reg_access rfreg;
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);