[iw] Update iw to version 0.9.13.

[openwrt.git] / package / libertas / src / ethtool.c

diff --git a/package/libertas/src/ethtool.c b/package/libertas/src/ethtool.c
index 21e6f98..688d60d 100644 (file)
--- a/package/libertas/src/ethtool.c
+++ b/package/libertas/src/ethtool.c
@@ -6,7 +6,6 @@
 #include "decl.h"
 #include "defs.h"
 #include "dev.h"
-#include "join.h"
 #include "wext.h"
 #include "cmd.h"
 
@@ -25,13 +24,14 @@ static void lbs_ethtool_get_drvinfo(struct net_device *dev,
                                         struct ethtool_drvinfo *info)
 {
        struct lbs_private *priv = (struct lbs_private *) dev->priv;
-       char fwver[32];
-
-       lbs_get_fwversion(priv, fwver, sizeof(fwver) - 1);
 
+       snprintf(info->fw_version, 32, "%u.%u.%u.p%u",
+               priv->fwrelease >> 24 & 0xff,
+               priv->fwrelease >> 16 & 0xff,
+               priv->fwrelease >>  8 & 0xff,
+               priv->fwrelease       & 0xff);
        strcpy(info->driver, "libertas");
        strcpy(info->version, lbs_driver_version);
-       strcpy(info->fw_version, fwver);
 }
 
 /* All 8388 parts have 16KiB EEPROM size at the time of writing.
@@ -48,66 +48,33 @@ static int lbs_ethtool_get_eeprom(struct net_device *dev,
                                   struct ethtool_eeprom *eeprom, u8 * bytes)
 {
        struct lbs_private *priv = (struct lbs_private *) dev->priv;
-       struct lbs_ioctl_regrdwr regctrl;
-       char *ptr;
+       struct cmd_ds_802_11_eeprom_access cmd;
        int ret;
 
-       regctrl.action = 0;
-       regctrl.offset = eeprom->offset;
-       regctrl.NOB = eeprom->len;
-
-       if (eeprom->offset + eeprom->len > LBS_EEPROM_LEN)
-               return -EINVAL;
-
-//      mutex_lock(&priv->mutex);
-
-       priv->prdeeprom = kmalloc(eeprom->len+sizeof(regctrl), GFP_KERNEL);
-       if (!priv->prdeeprom)
-               return -ENOMEM;
-       memcpy(priv->prdeeprom, &regctrl, sizeof(regctrl));
-
-       /* +14 is for action, offset, and NOB in
-        * response */
-       lbs_deb_ethtool("action:%d offset: %x NOB: %02x\n",
-              regctrl.action, regctrl.offset, regctrl.NOB);
-
-       ret = lbs_prepare_and_send_command(priv,
-                                   CMD_802_11_EEPROM_ACCESS,
-                                   regctrl.action,
-                                   CMD_OPTION_WAITFORRSP, 0,
-                                   &regctrl);
+       lbs_deb_enter(LBS_DEB_ETHTOOL);
 
-       if (ret) {
-               if (priv->prdeeprom)
-                       kfree(priv->prdeeprom);
-               goto done;
+       if (eeprom->offset + eeprom->len > LBS_EEPROM_LEN ||
+           eeprom->len > LBS_EEPROM_READ_LEN) {
+               ret = -EINVAL;
+               goto out;
        }
 
-       mdelay(10);
-
-       ptr = (char *)priv->prdeeprom;
-
-       /* skip the command header, but include the "value" u32 variable */
-       ptr = ptr + sizeof(struct lbs_ioctl_regrdwr) - 4;
-
-       /*
-        * Return the result back to the user
-        */
-       memcpy(bytes, ptr, eeprom->len);
-
-       if (priv->prdeeprom)
-               kfree(priv->prdeeprom);
-//     mutex_unlock(&priv->mutex);
-
-       ret = 0;
-
-done:
-       lbs_deb_enter_args(LBS_DEB_ETHTOOL, "ret %d", ret);
+       cmd.hdr.size = cpu_to_le16(sizeof(struct cmd_ds_802_11_eeprom_access) -
+               LBS_EEPROM_READ_LEN + eeprom->len);
+       cmd.action = cpu_to_le16(CMD_ACT_GET);
+       cmd.offset = cpu_to_le16(eeprom->offset);
+       cmd.len    = cpu_to_le16(eeprom->len);
+       ret = lbs_cmd_with_response(priv, CMD_802_11_EEPROM_ACCESS, &cmd);
+       if (!ret)
+               memcpy(bytes, cmd.value, eeprom->len);
+
+out:
+       lbs_deb_leave_args(LBS_DEB_ETHTOOL, "ret %d", ret);
         return ret;
 }
 
-static void lbs_ethtool_get_stats(struct net_device * dev,
-                               struct ethtool_stats * stats, u64 * data)
+static void lbs_ethtool_get_stats(struct net_device *dev,
+                                 struct ethtool_stats *stats, uint64_t *data)
 {
        struct lbs_private *priv = dev->priv;
        struct cmd_ds_mesh_access mesh_access;
@@ -116,12 +83,12 @@ static void lbs_ethtool_get_stats(struct net_device * dev,
        lbs_deb_enter(LBS_DEB_ETHTOOL);
 
        /* Get Mesh Statistics */
-       ret = lbs_prepare_and_send_command(priv,
-                       CMD_MESH_ACCESS, CMD_ACT_MESH_GET_STATS,
-                       CMD_OPTION_WAITFORRSP, 0, &mesh_access);
+       ret = lbs_mesh_access(priv, CMD_ACT_MESH_GET_STATS, &mesh_access);
 
-       if (ret)
+       if (ret) {
+               memset(data, 0, MESH_STATS_NUM*(sizeof(uint64_t)));
                return;
+       }
 
        priv->mstats.fwd_drop_rbt = le32_to_cpu(mesh_access.data[0]);
        priv->mstats.fwd_drop_ttl = le32_to_cpu(mesh_access.data[1]);
@@ -144,19 +111,18 @@ static void lbs_ethtool_get_stats(struct net_device * dev,
        lbs_deb_enter(LBS_DEB_ETHTOOL);
 }
 
-static int lbs_ethtool_get_sset_count(struct net_device * dev, int sset)
+static int lbs_ethtool_get_sset_count(struct net_device *dev, int sset)
 {
-       switch (sset) {
-       case ETH_SS_STATS:
+       struct lbs_private *priv = dev->priv;
+
+       if (sset == ETH_SS_STATS && dev == priv->mesh_dev)
                return MESH_STATS_NUM;
-       default:
-               return -EOPNOTSUPP;
-       }
+
+       return -EOPNOTSUPP;
 }
 
 static void lbs_ethtool_get_strings(struct net_device *dev,
-                                         u32 stringset,
-                                         u8 * s)
+                                   uint32_t stringset, uint8_t *s)
 {
        int i;