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, 0 insertions, 27 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;