diff options
author | David Woodhouse <dwmw2@infradead.org> | 2007-12-11 18:57:49 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:06:53 -0800 |
commit | 1f8a08342c8c1c90d0b752f28eb6f24ea7164cdb (patch) | |
tree | 97ef038bb2f2e42e813801957b581d4f9d73c564 /drivers/net/wireless/libertas/main.c | |
parent | 23a397ac821ab0aa263bda47131bb0628e49101a (diff) |
libertas: kill references to mesh autostart
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/main.c')
-rw-r--r-- | drivers/net/wireless/libertas/main.c | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index fd76c46225d1..bb685ac8e15e 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c @@ -369,46 +369,8 @@ static DEVICE_ATTR(lbs_mesh, 0644, lbs_mesh_get, lbs_mesh_set); */ static DEVICE_ATTR(anycast_mask, 0644, lbs_anycast_get, lbs_anycast_set); -static ssize_t lbs_autostart_enabled_get(struct device *dev, - struct device_attribute *attr, char * buf) -{ - struct lbs_private *priv = to_net_dev(dev)->priv; - struct cmd_ds_mesh_access mesh_access; - int ret; - - memset(&mesh_access, 0, sizeof(mesh_access)); - - ret = lbs_mesh_access(priv, CMD_ACT_MESH_GET_AUTOSTART_ENABLED, &mesh_access); - if (ret) - return ret; - return sprintf(buf, "%d\n", le32_to_cpu(mesh_access.data[0])); -} - -static ssize_t lbs_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; - struct lbs_private *priv = (to_net_dev(dev))->priv; - int ret; - - memset(&mesh_access, 0, sizeof(mesh_access)); - sscanf(buf, "%d", &datum); - mesh_access.data[0] = cpu_to_le32(datum); - - ret = lbs_mesh_access(priv, CMD_ACT_MESH_SET_AUTOSTART_ENABLED, &mesh_access); - if (ret == 0) - priv->mesh_autostart_enabled = datum ? 1 : 0; - - return strlen(buf); -} - -static DEVICE_ATTR(autostart_enabled, 0644, - lbs_autostart_enabled_get, lbs_autostart_enabled_set); - static struct attribute *lbs_mesh_sysfs_entries[] = { &dev_attr_anycast_mask.attr, - &dev_attr_autostart_enabled.attr, NULL, }; @@ -883,7 +845,6 @@ static int lbs_thread(void *data) static int lbs_setup_firmware(struct lbs_private *priv) { int ret = -1; - struct cmd_ds_mesh_access mesh_access; lbs_deb_enter(LBS_DEB_FW); @@ -905,21 +866,6 @@ static int lbs_setup_firmware(struct lbs_private *priv) goto done; } - /* Disable mesh autostart */ - if (priv->mesh_dev) { - memset(&mesh_access, 0, sizeof(mesh_access)); - mesh_access.data[0] = cpu_to_le32(0); - ret = lbs_mesh_access(priv, CMD_ACT_MESH_SET_AUTOSTART_ENABLED, - &mesh_access); - if (ret) { - printk("Mesh autostart set failed\n"); - ret = 0; - //ret = -1; - goto done; - } - priv->mesh_autostart_enabled = 0; - } - ret = 0; done: lbs_deb_leave_args(LBS_DEB_FW, "ret %d", ret); |