- Update to 2.6.25-rc3.
[linux-flexiantxendom0-3.2.10.git] / drivers / net / wireless / libertas / ethtool.c
index 3dae152..21e6f98 100644 (file)
@@ -8,6 +8,8 @@
 #include "dev.h"
 #include "join.h"
 #include "wext.h"
+#include "cmd.h"
+
 static const char * mesh_stat_strings[]= {
                        "drop_duplicate_bcast",
                        "drop_ttl_zero",
@@ -19,35 +21,34 @@ static const char * mesh_stat_strings[]= {
                        "tx_failed_cnt"
 };
 
-static void libertas_ethtool_get_drvinfo(struct net_device *dev,
+static void lbs_ethtool_get_drvinfo(struct net_device *dev,
                                         struct ethtool_drvinfo *info)
 {
-       wlan_private *priv = (wlan_private *) dev->priv;
+       struct lbs_private *priv = (struct lbs_private *) dev->priv;
        char fwver[32];
 
-       libertas_get_fwversion(priv->adapter, fwver, sizeof(fwver) - 1);
+       lbs_get_fwversion(priv, fwver, sizeof(fwver) - 1);
 
        strcpy(info->driver, "libertas");
-       strcpy(info->version, libertas_driver_version);
+       strcpy(info->version, lbs_driver_version);
        strcpy(info->fw_version, fwver);
 }
 
 /* All 8388 parts have 16KiB EEPROM size at the time of writing.
  * In case that changes this needs fixing.
  */
-#define LIBERTAS_EEPROM_LEN 16384
+#define LBS_EEPROM_LEN 16384
 
-static int libertas_ethtool_get_eeprom_len(struct net_device *dev)
+static int lbs_ethtool_get_eeprom_len(struct net_device *dev)
 {
-       return LIBERTAS_EEPROM_LEN;
+       return LBS_EEPROM_LEN;
 }
 
-static int libertas_ethtool_get_eeprom(struct net_device *dev,
+static int lbs_ethtool_get_eeprom(struct net_device *dev,
                                   struct ethtool_eeprom *eeprom, u8 * bytes)
 {
-       wlan_private *priv = (wlan_private *) dev->priv;
-       wlan_adapter *adapter = priv->adapter;
-       struct wlan_ioctl_regrdwr regctrl;
+       struct lbs_private *priv = (struct lbs_private *) dev->priv;
+       struct lbs_ioctl_regrdwr regctrl;
        char *ptr;
        int ret;
 
@@ -55,47 +56,47 @@ static int libertas_ethtool_get_eeprom(struct net_device *dev,
        regctrl.offset = eeprom->offset;
        regctrl.NOB = eeprom->len;
 
-       if (eeprom->offset + eeprom->len > LIBERTAS_EEPROM_LEN)
+       if (eeprom->offset + eeprom->len > LBS_EEPROM_LEN)
                return -EINVAL;
 
 //      mutex_lock(&priv->mutex);
 
-       adapter->prdeeprom = kmalloc(eeprom->len+sizeof(regctrl), GFP_KERNEL);
-       if (!adapter->prdeeprom)
+       priv->prdeeprom = kmalloc(eeprom->len+sizeof(regctrl), GFP_KERNEL);
+       if (!priv->prdeeprom)
                return -ENOMEM;
-       memcpy(adapter->prdeeprom, &regctrl, sizeof(regctrl));
+       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 = libertas_prepare_and_send_command(priv,
+       ret = lbs_prepare_and_send_command(priv,
                                    CMD_802_11_EEPROM_ACCESS,
                                    regctrl.action,
                                    CMD_OPTION_WAITFORRSP, 0,
                                    &regctrl);
 
        if (ret) {
-               if (adapter->prdeeprom)
-                       kfree(adapter->prdeeprom);
+               if (priv->prdeeprom)
+                       kfree(priv->prdeeprom);
                goto done;
        }
 
        mdelay(10);
 
-       ptr = (char *)adapter->prdeeprom;
+       ptr = (char *)priv->prdeeprom;
 
        /* skip the command header, but include the "value" u32 variable */
-       ptr = ptr + sizeof(struct wlan_ioctl_regrdwr) - 4;
+       ptr = ptr + sizeof(struct lbs_ioctl_regrdwr) - 4;
 
        /*
         * Return the result back to the user
         */
        memcpy(bytes, ptr, eeprom->len);
 
-       if (adapter->prdeeprom)
-               kfree(adapter->prdeeprom);
+       if (priv->prdeeprom)
+               kfree(priv->prdeeprom);
 //     mutex_unlock(&priv->mutex);
 
        ret = 0;
@@ -105,17 +106,17 @@ done:
         return ret;
 }
 
-static void libertas_ethtool_get_stats(struct net_device * dev,
+static void lbs_ethtool_get_stats(struct net_device * dev,
                                struct ethtool_stats * stats, u64 * data)
 {
-       wlan_private *priv = dev->priv;
+       struct lbs_private *priv = dev->priv;
        struct cmd_ds_mesh_access mesh_access;
        int ret;
 
        lbs_deb_enter(LBS_DEB_ETHTOOL);
 
        /* Get Mesh Statistics */
-       ret = libertas_prepare_and_send_command(priv,
+       ret = lbs_prepare_and_send_command(priv,
                        CMD_MESH_ACCESS, CMD_ACT_MESH_GET_STATS,
                        CMD_OPTION_WAITFORRSP, 0, &mesh_access);
 
@@ -143,7 +144,7 @@ static void libertas_ethtool_get_stats(struct net_device * dev,
        lbs_deb_enter(LBS_DEB_ETHTOOL);
 }
 
-static int libertas_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:
@@ -153,7 +154,7 @@ static int libertas_ethtool_get_sset_count(struct net_device * dev, int sset)
        }
 }
 
-static void libertas_ethtool_get_strings (struct net_device * dev,
+static void lbs_ethtool_get_strings(struct net_device *dev,
                                          u32 stringset,
                                          u8 * s)
 {
@@ -173,12 +174,57 @@ static void libertas_ethtool_get_strings (struct net_device * dev,
        lbs_deb_enter(LBS_DEB_ETHTOOL);
 }
 
-struct ethtool_ops libertas_ethtool_ops = {
-       .get_drvinfo = libertas_ethtool_get_drvinfo,
-       .get_eeprom =  libertas_ethtool_get_eeprom,
-       .get_eeprom_len = libertas_ethtool_get_eeprom_len,
-       .get_sset_count = libertas_ethtool_get_sset_count,
-       .get_ethtool_stats = libertas_ethtool_get_stats,
-       .get_strings = libertas_ethtool_get_strings,
+static void lbs_ethtool_get_wol(struct net_device *dev,
+                               struct ethtool_wolinfo *wol)
+{
+       struct lbs_private *priv = dev->priv;
+
+       if (priv->wol_criteria == 0xffffffff) {
+               /* Interface driver didn't configure wake */
+               wol->supported = wol->wolopts = 0;
+               return;
+       }
+
+       wol->supported = WAKE_UCAST|WAKE_MCAST|WAKE_BCAST|WAKE_PHY;
+
+       if (priv->wol_criteria & EHS_WAKE_ON_UNICAST_DATA)
+               wol->wolopts |= WAKE_UCAST;
+       if (priv->wol_criteria & EHS_WAKE_ON_MULTICAST_DATA)
+               wol->wolopts |= WAKE_MCAST;
+       if (priv->wol_criteria & EHS_WAKE_ON_BROADCAST_DATA)
+               wol->wolopts |= WAKE_BCAST;
+       if (priv->wol_criteria & EHS_WAKE_ON_MAC_EVENT)
+               wol->wolopts |= WAKE_PHY;
+}
+
+static int lbs_ethtool_set_wol(struct net_device *dev,
+                              struct ethtool_wolinfo *wol)
+{
+       struct lbs_private *priv = dev->priv;
+       uint32_t criteria = 0;
+
+       if (priv->wol_criteria == 0xffffffff && wol->wolopts)
+               return -EOPNOTSUPP;
+
+       if (wol->wolopts & ~(WAKE_UCAST|WAKE_MCAST|WAKE_BCAST|WAKE_PHY))
+               return -EOPNOTSUPP;
+
+       if (wol->wolopts & WAKE_UCAST) criteria |= EHS_WAKE_ON_UNICAST_DATA;
+       if (wol->wolopts & WAKE_MCAST) criteria |= EHS_WAKE_ON_MULTICAST_DATA;
+       if (wol->wolopts & WAKE_BCAST) criteria |= EHS_WAKE_ON_BROADCAST_DATA;
+       if (wol->wolopts & WAKE_PHY)   criteria |= EHS_WAKE_ON_MAC_EVENT;
+
+       return lbs_host_sleep_cfg(priv, criteria);
+}
+
+struct ethtool_ops lbs_ethtool_ops = {
+       .get_drvinfo = lbs_ethtool_get_drvinfo,
+       .get_eeprom =  lbs_ethtool_get_eeprom,
+       .get_eeprom_len = lbs_ethtool_get_eeprom_len,
+       .get_sset_count = lbs_ethtool_get_sset_count,
+       .get_ethtool_stats = lbs_ethtool_get_stats,
+       .get_strings = lbs_ethtool_get_strings,
+       .get_wol = lbs_ethtool_get_wol,
+       .set_wol = lbs_ethtool_set_wol,
 };