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/if_usb.c | |
| parent | 23a397ac821ab0aa263bda47131bb0628e49101a (diff) | |
| download | kernel-crypto-1f8a08342c8c1c90d0b752f28eb6f24ea7164cdb.tar.gz kernel-crypto-1f8a08342c8c1c90d0b752f28eb6f24ea7164cdb.tar.xz kernel-crypto-1f8a08342c8c1c90d0b752f28eb6f24ea7164cdb.zip | |
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/if_usb.c')
| -rw-r--r-- | drivers/net/wireless/libertas/if_usb.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c index 351c7ea4318..b19a6c9c2a7 100644 --- a/drivers/net/wireless/libertas/if_usb.c +++ b/drivers/net/wireless/libertas/if_usb.c @@ -978,17 +978,6 @@ static int if_usb_suspend(struct usb_interface *intf, pm_message_t message) if (priv->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); - lbs_mesh_access(priv, CMD_ACT_MESH_SET_AUTOSTART_ENABLED, &mesh_access); - } - netif_device_detach(cardp->eth_dev); netif_device_detach(priv->mesh_dev); @@ -1016,16 +1005,6 @@ 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); - lbs_mesh_access(priv, CMD_ACT_MESH_SET_AUTOSTART_ENABLED, &mesh_access); - } - lbs_deb_leave(LBS_DEB_USB); return 0; } |