summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2014-06-25 21:20:03 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-26 20:23:32 -0400
commit97b9cd8daab286a4b282080c2f6359bd2e4113c8 (patch)
treee679866a081882d9d656c2de6b6119bfecff73ca
parent3576ff672d36b4ccf0ec67ca0ef418f7cd0481b9 (diff)
staging: vt6656: Remove vnt_set_channel from device_init_registers
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/vt6656/main_usb.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index feecd5183f9c..56bdf9dca511 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -242,7 +242,6 @@ device_set_options(struct vnt_private *pDevice) {
*/
static int device_init_registers(struct vnt_private *pDevice)
{
- struct vnt_manager *pMgmt = &pDevice->vnt_mgmt;
struct vnt_cmd_card_init *init_cmd = &pDevice->init_command;
struct vnt_rsp_card_init *init_rsp = &pDevice->init_response;
u8 abyBroadcastAddr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
@@ -468,12 +467,6 @@ static int device_init_registers(struct vnt_private *pDevice)
}
}
- pMgmt->eScanType = WMAC_SCAN_PASSIVE;
- pMgmt->uCurrChannel = pDevice->uChannel;
- pMgmt->uIBSSChannel = pDevice->uChannel;
-
- vnt_set_channel(pDevice, pMgmt->uCurrChannel);
-
/* get permanent network address */
memcpy(pDevice->abyPermanentNetAddr, init_rsp->net_addr, 6);
memcpy(pDevice->abyCurrentNetAddr,