staging: vt6656: device_init_registers move out vnt_set_bss_mode
authorMalcolm Priestley <tvboxspy@gmail.com>
Sat, 28 Jun 2014 22:55:46 +0000 (23:55 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 29 Jun 2014 21:25:53 +0000 (14:25 -0700)
Move to vnt_add_interface and allow to refresh at the start
of every software scan in vnt_sw_scan_start

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/main_usb.c

index e0ed1bb..14845ec 100644 (file)
@@ -438,7 +438,6 @@ static int device_init_registers(struct vnt_private *pDevice)
                pDevice->bShortSlotTime = false;
 
        BBvSetShortSlotTime(pDevice);
-       vnt_set_bss_mode(pDevice);
 
        pDevice->byRadioCtl = pDevice->abyEEPROM[EEP_OFS_RADIOCTL];
        pDevice->bHWRadioOff = false;
@@ -749,6 +748,8 @@ static int vnt_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
 
        priv->op_mode = vif->type;
 
+       vnt_set_bss_mode(priv);
+
        /* LED blink on TX */
        vnt_mac_set_led(priv, LEDSTS_STS, LEDSTS_INTER);
 
@@ -992,6 +993,7 @@ static void vnt_sw_scan_start(struct ieee80211_hw *hw)
 {
        struct vnt_private *priv = hw->priv;
 
+       vnt_set_bss_mode(priv);
        /* Set max sensitivity*/
        BBvUpdatePreEDThreshold(priv, true);
 }