[PATCH] Support for mesh autostart deactivation through sysfs

echo 0 > /sys/class/net/mshX/autostart_enabled

This is supported from Marvell firmware version 5.110.16.p0 (to be released).

Signed-off-by: Luis Carlos Cobo <luisca@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/libertas/host.h b/drivers/net/wireless/libertas/host.h
index 308ccdbed3444d532bfaaf5c393706bb9a855fd5..12d5dd9af40cdde1c222d1a9a51bd92dc5ad2617 100644 (file)
--- a/drivers/net/wireless/libertas/host.h
+++ b/drivers/net/wireless/libertas/host.h
@@ -320,6 +320,8 @@ enum cmd_mesh_access_opts {
        CMD_ACT_MESH_GET_RREQ_DELAY,
        CMD_ACT_MESH_SET_ROUTE_EXP,
        CMD_ACT_MESH_GET_ROUTE_EXP,
+       CMD_ACT_MESH_SET_AUTOSTART_ENABLED,
+       CMD_ACT_MESH_GET_AUTOSTART_ENABLED,
 };
 
 /** Card Event definition */

diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index b4e2cd19c3bce72981526eb6b2603f1929e4007e..717b33616ea819e76e96f96eb545312c88dce4b0 100644 (file)
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -252,6 +252,50 @@ static ssize_t libertas_anycast_set(struct device * dev,
  */
 static DEVICE_ATTR(anycast_mask, 0644, libertas_anycast_get, libertas_anycast_set);
 
+static ssize_t libertas_autostart_enabled_get(struct device * dev,
+               struct device_attribute *attr, char * buf)
+{
+       struct cmd_ds_mesh_access mesh_access;
+
+       memset(&mesh_access, 0, sizeof(mesh_access));
+       libertas_prepare_and_send_command(to_net_dev(dev)->priv,
+                       CMD_MESH_ACCESS,
+                       CMD_ACT_MESH_GET_AUTOSTART_ENABLED,
+                       CMD_OPTION_WAITFORRSP, 0, (void *)&mesh_access);
+
+       return sprintf(buf, "%d\n", le32_to_cpu(mesh_access.data[0]));
+}
+
+static ssize_t libertas_autostart_enabled_set(struct device * dev,
+               struct device_attribute *attr, const char * buf, size_t count)
+{
+       struct cmd_ds_mesh_access mesh_access;
+       uint32_t datum;
+
+       memset(&mesh_access, 0, sizeof(mesh_access));
+       sscanf(buf, "%d", &datum);
+       mesh_access.data[0] = cpu_to_le32(datum);
+
+       libertas_prepare_and_send_command((to_net_dev(dev))->priv,
+                       CMD_MESH_ACCESS,
+                       CMD_ACT_MESH_SET_AUTOSTART_ENABLED,
+                       CMD_OPTION_WAITFORRSP, 0, (void *)&mesh_access);
+       return strlen(buf);
+}
+
+static DEVICE_ATTR(autostart_enabled, 0644,
+               libertas_autostart_enabled_get, libertas_autostart_enabled_set);
+
+static struct attribute *libertas_mesh_sysfs_entries[] = {
+       &dev_attr_anycast_mask.attr,
+       &dev_attr_autostart_enabled.attr,
+       NULL,
+};
+
+static struct attribute_group libertas_mesh_attr_group = {
+       .attrs = libertas_mesh_sysfs_entries,
+};
+
 /**
  *  @brief Check if the device can be open and wait if necessary.
  *
@@ -1250,7 +1294,7 @@ int libertas_add_mesh(wlan_private *priv, struct device *dev)
                goto err_free;
        }
 
-       ret = device_create_file(&(mesh_dev->dev), &dev_attr_anycast_mask);
+       ret = sysfs_create_group(&(mesh_dev->dev.kobj), &libertas_mesh_attr_group);
        if (ret)
                goto err_unregister;
 
@@ -1359,7 +1403,7 @@ void libertas_remove_mesh(wlan_private *priv)
        netif_stop_queue(mesh_dev);
        netif_carrier_off(priv->mesh_dev);
 
-       device_remove_file(&(mesh_dev->dev), &dev_attr_anycast_mask);
+       sysfs_remove_group(&(mesh_dev->dev.kobj), &libertas_mesh_attr_group);
        unregister_netdev(mesh_dev);
 
        priv->mesh_dev = NULL ;