staging: vt6656: remove vnt_add_basic_rate
authorMalcolm Priestley <tvboxspy@gmail.com>
Sat, 28 Jun 2014 22:55:44 +0000 (23:55 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 29 Jun 2014 21:25:53 +0000 (14:25 -0700)
The driver never sets basic rate any more so remove function.

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

index 2ef45ca90fa910e038cc492b8812828833a2e25a..82d6b640132c98e26792b71947705bc707091d80 100644 (file)
@@ -470,28 +470,6 @@ void vnt_update_top_rates(struct vnt_private *priv)
        priv->byTopCCKBasicRate = top_cck;
  }
 
-/*
- * Description: Set NIC Tx Basic Rate
- *
- * Parameters:
- *  In:
- *      pDevice         - The adapter to be set
- *      wBasicRate      - Basic Rate to be set
- *  Out:
- *      none
- *
- * Return Value: true if succeeded; false if failed.
- *
- */
-void vnt_add_basic_rate(struct vnt_private *priv, u16 rate_idx)
-{
-
-       priv->wBasicRate |= (1 << rate_idx);
-
-       /*Determines the highest basic rate.*/
-       vnt_update_top_rates(priv);
-}
-
 int vnt_ofdm_min_rate(struct vnt_private *priv)
 {
        int ii;
index 8c6f67d5a9675b05cdf5a780297d5d73a9bd66bc..5b7cc5a908f6cb5c4ad96702b93655ebb92bdd31 100644 (file)
@@ -49,7 +49,6 @@ void vnt_set_channel(struct vnt_private *, u32);
 void vnt_set_rspinf(struct vnt_private *, u8);
 void vnt_update_ifs(struct vnt_private *);
 void vnt_update_top_rates(struct vnt_private *);
-void vnt_add_basic_rate(struct vnt_private *, u16);
 int vnt_ofdm_min_rate(struct vnt_private *);
 void vnt_adjust_tsf(struct vnt_private *, u8, u64, u64);
 bool vnt_get_current_tsf(struct vnt_private *, u64 *);
index a1d0c983ccd0a51ab382964cc8f6f0d420c62200..d8164ecc01349a78b8e99a94d7207c4327814f2d 100644 (file)
@@ -432,13 +432,10 @@ static int device_init_registers(struct vnt_private *pDevice)
        * set BB and packet type at the same time
        * set Short Slot Time, xIFS, and RSPINF
        */
-       if (pDevice->byBBType == BB_TYPE_11A) {
-               vnt_add_basic_rate(pDevice, RATE_6M);
+       if (pDevice->byBBType == BB_TYPE_11A)
                pDevice->bShortSlotTime = true;
-       } else {
-               vnt_add_basic_rate(pDevice, RATE_1M);
+       else
                pDevice->bShortSlotTime = false;
-       }
 
        BBvSetShortSlotTime(pDevice);
        vnt_set_bss_mode(pDevice);