6 files changed, 10 insertions, 47 deletions

diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index fcea2a124a56..95d98203eb4e 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -624,10 +624,6 @@ void lbs_association_worker(struct work_struct *work)
                         lbs_prepare_and_send_command(priv,
                                 CMD_802_11_RSSI,
                                 0, CMD_OPTION_WAITFORRSP, 0, NULL);
-
-                        lbs_prepare_and_send_command(priv,
-                                CMD_802_11_GET_LOG,
-                                0, CMD_OPTION_WAITFORRSP, 0, NULL);
                 } else {
                         ret = -1;
                 }
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index be8a170b633f..5e35788946f1 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -494,18 +494,6 @@ static int lbs_cmd_802_11_reset(struct lbs_private *priv,
         return 0;
 }
 
-static int lbs_cmd_802_11_get_log(struct lbs_private *priv,
-                                   struct cmd_ds_command *cmd)
-{
-        lbs_deb_enter(LBS_DEB_CMD);
-        cmd->command = cpu_to_le16(CMD_802_11_GET_LOG);
-        cmd->size =
-                cpu_to_le16(sizeof(struct cmd_ds_802_11_get_log) + S_DS_GEN);
-
-        lbs_deb_leave(LBS_DEB_CMD);
-        return 0;
-}
-
 static int lbs_cmd_802_11_get_stat(struct lbs_private *priv,
                                     struct cmd_ds_command *cmd)
 {
@@ -1423,10 +1411,6 @@ int lbs_prepare_and_send_command(struct lbs_private *priv,
                 ret = lbs_cmd_802_11_reset(priv, cmdptr, cmd_action);
                 break;
 
-        case CMD_802_11_GET_LOG:
-                ret = lbs_cmd_802_11_get_log(priv, cmdptr);
-                break;
-
         case CMD_802_11_AUTHENTICATE:
                 ret = lbs_cmd_80211_authenticate(priv, cmdptr, pdata_buf);
                 break;
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index 5534a7b859da..240feeb1b49b 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -303,20 +303,6 @@ static int lbs_ret_802_11_eeprom_access(struct lbs_private *priv,
         return 0;
 }
 
-static int lbs_ret_get_log(struct lbs_private *priv,
-                            struct cmd_ds_command *resp)
-{
-        struct cmd_ds_802_11_get_log *logmessage = &resp->params.glog;
-
-        lbs_deb_enter(LBS_DEB_CMD);
-
-        /* Stored little-endian */
-        memcpy(&priv->logmsg, logmessage, sizeof(struct cmd_ds_802_11_get_log));
-
-        lbs_deb_leave(LBS_DEB_CMD);
-        return 0;
-}
-
 static int lbs_ret_802_11_bcn_ctrl(struct lbs_private * priv,
                                         struct cmd_ds_command *resp)
 {
@@ -352,10 +338,6 @@ static inline int handle_cmd_response(struct lbs_private *priv,
                 ret = lbs_ret_reg_access(priv, respcmd, resp);
                 break;
 
-        case CMD_RET(CMD_802_11_GET_LOG):
-                ret = lbs_ret_get_log(priv, resp);
-                break;
-
         case CMD_RET_802_11_ASSOCIATE:
         case CMD_RET(CMD_802_11_ASSOCIATE):
         case CMD_RET(CMD_802_11_REASSOCIATE):
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index 4122a3223432..17e02bed6bfa 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -323,8 +323,6 @@ struct lbs_private {
         u8 *prdeeprom;
         struct lbs_offset_value offsetvalue;
 
-        struct cmd_ds_802_11_get_log logmsg;
-
         u32 monitormode;
         u8 fw_ready;
 };
diff --git a/drivers/net/wireless/libertas/hostcmd.h b/drivers/net/wireless/libertas/hostcmd.h
index b5361b3393d9..acbcd56831cb 100644
--- a/drivers/net/wireless/libertas/hostcmd.h
+++ b/drivers/net/wireless/libertas/hostcmd.h
@@ -195,6 +195,8 @@ struct cmd_ds_802_11_scan_rsp {
 };
 
 struct cmd_ds_802_11_get_log {
+        struct cmd_header hdr;
+
         __le32 mcasttxframe;
         __le32 failed;
         __le32 retry;
@@ -701,7 +703,6 @@ struct cmd_ds_command {
                 struct cmd_ds_802_11_ad_hoc_start ads;
                 struct cmd_ds_802_11_reset reset;
                 struct cmd_ds_802_11_ad_hoc_result result;
-                struct cmd_ds_802_11_get_log glog;
                 struct cmd_ds_802_11_authenticate auth;
                 struct cmd_ds_802_11_get_stat gstat;
                 struct cmd_ds_802_3_get_stat gstat_8023;
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
index cded4bb69164..5ccb4e0c8d64 100644
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -820,6 +820,7 @@ static struct iw_statistics *lbs_get_wireless_stats(struct net_device *dev)
         int stats_valid = 0;
         u8 rssi;
         u32 tx_retries;
+        struct cmd_ds_802_11_get_log log;
 
         lbs_deb_enter(LBS_DEB_WEXT);
 
@@ -863,7 +864,11 @@ static struct iw_statistics *lbs_get_wireless_stats(struct net_device *dev)
         /* Quality by TX errors */
         priv->wstats.discard.retries = priv->stats.tx_errors;
 
-        tx_retries = le32_to_cpu(priv->logmsg.retry);
+        memset(&log, 0, sizeof(log));
+        log.hdr.size = cpu_to_le16(sizeof(log));
+        lbs_cmd_with_response(priv, CMD_802_11_GET_LOG, &log);
+
+        tx_retries = le32_to_cpu(log.retry);
 
         if (tx_retries > 75)
                 tx_qual = (90 - tx_retries) * POOR / 15;
@@ -879,10 +884,9 @@ static struct iw_statistics *lbs_get_wireless_stats(struct net_device *dev)
                     (PERFECT - VERY_GOOD) / 50 + VERY_GOOD;
         quality = min(quality, tx_qual);
 
-        priv->wstats.discard.code = le32_to_cpu(priv->logmsg.wepundecryptable);
-        priv->wstats.discard.fragment = le32_to_cpu(priv->logmsg.rxfrag);
+        priv->wstats.discard.code = le32_to_cpu(log.wepundecryptable);
         priv->wstats.discard.retries = tx_retries;
-        priv->wstats.discard.misc = le32_to_cpu(priv->logmsg.ackfailure);
+        priv->wstats.discard.misc = le32_to_cpu(log.ackfailure);
 
         /* Calculate quality */
         priv->wstats.qual.qual = min_t(u8, quality, 100);
@@ -892,8 +896,6 @@ static struct iw_statistics *lbs_get_wireless_stats(struct net_device *dev)
         /* update stats asynchronously for future calls */
         lbs_prepare_and_send_command(priv, CMD_802_11_RSSI, 0,
                                         0, 0, NULL);
-        lbs_prepare_and_send_command(priv, CMD_802_11_GET_LOG, 0,
-                                        0, 0, NULL);
 out:
         if (!stats_valid) {
                 priv->wstats.miss.beacon = 0;