staging: vt6656: Remove vnt_set_channel from device_init_registers
authorMalcolm Priestley <tvboxspy@gmail.com>
Wed, 25 Jun 2014 20:20:03 +0000 (21:20 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Jun 2014 00:23:32 +0000 (20:23 -0400)
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/main_usb.c

index feecd5183f9c7fdfbd5caa39311216fbf5f8b25d..56bdf9dca51159d791f942946bb323a142f3484b 100644 (file)
@@ -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,