[PATCH] libertas: keep mesh autostart enabled while asleep
After loading the firmware, mesh autostart will be disabled. After that, the user will still be able to enable or disable it at will. On suspend, it will be always activated and later on resume it will go back to the state it had before going to sleep. Signed-off-by: Luis Carlos Cobo <luisca@cozybit.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
committed by
David S. Miller
parent
b37e5842f5
commit
d21b31fd53
@@ -990,6 +990,19 @@ static int if_usb_suspend(struct usb_interface *intf, pm_message_t message)
|
||||
if (priv->adapter->psstate != PS_STATE_FULL_POWER)
|
||||
return -1;
|
||||
|
||||
if (priv->mesh_dev && !priv->mesh_autostart_enabled) {
|
||||
/* Mesh autostart must be activated while sleeping
|
||||
* On resume it will go back to the current state
|
||||
*/
|
||||
struct cmd_ds_mesh_access mesh_access;
|
||||
memset(&mesh_access, 0, sizeof(mesh_access));
|
||||
mesh_access.data[0] = cpu_to_le32(1);
|
||||
libertas_prepare_and_send_command(priv,
|
||||
CMD_MESH_ACCESS,
|
||||
CMD_ACT_MESH_SET_AUTOSTART_ENABLED,
|
||||
CMD_OPTION_WAITFORRSP, 0, (void *)&mesh_access);
|
||||
}
|
||||
|
||||
netif_device_detach(cardp->eth_dev);
|
||||
netif_device_detach(priv->mesh_dev);
|
||||
|
||||
@@ -1017,6 +1030,19 @@ static int if_usb_resume(struct usb_interface *intf)
|
||||
netif_device_attach(cardp->eth_dev);
|
||||
netif_device_attach(priv->mesh_dev);
|
||||
|
||||
if (priv->mesh_dev && !priv->mesh_autostart_enabled) {
|
||||
/* Mesh autostart was activated while sleeping
|
||||
* Disable it if appropriate
|
||||
*/
|
||||
struct cmd_ds_mesh_access mesh_access;
|
||||
memset(&mesh_access, 0, sizeof(mesh_access));
|
||||
mesh_access.data[0] = cpu_to_le32(0);
|
||||
libertas_prepare_and_send_command(priv,
|
||||
CMD_MESH_ACCESS,
|
||||
CMD_ACT_MESH_SET_AUTOSTART_ENABLED,
|
||||
CMD_OPTION_WAITFORRSP, 0, (void *)&mesh_access);
|
||||
}
|
||||
|
||||
lbs_deb_leave(LBS_DEB_USB);
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user