]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
staging: vt6656: remove difs / sifs adjustments.
authorMalcolm Priestley <tvboxspy@gmail.com>
Tue, 5 May 2020 21:23:39 +0000 (22:23 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 13 May 2020 11:53:58 +0000 (13:53 +0200)
Now mac89211 is doing frame timing in rxtx these vendor adjustments need
to be removed.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Link: https://lore.kernel.org/r/034e445c-b245-52c4-c855-431b9783bcff@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/card.c

index 3cb97c4daeb882d8a2fe9eb5a51b17f36422b11c..10f3dfda83b54d68f0c4300e4bdc22111fea24b9 100644 (file)
@@ -149,38 +149,6 @@ int vnt_update_ifs(struct vnt_private *priv)
 
        priv->eifs = C_EIFS;
 
-       switch (priv->rf_type) {
-       case RF_VT3226D0:
-               if (priv->bb_type != BB_TYPE_11B) {
-                       priv->sifs -= 1;
-                       priv->difs -= 1;
-                       break;
-               }
-               /* fall through */
-       case RF_AIROHA7230:
-       case RF_AL2230:
-       case RF_AL2230S:
-               if (priv->bb_type != BB_TYPE_11B)
-                       break;
-               /* fall through */
-       case RF_RFMD2959:
-       case RF_VT3226:
-       case RF_VT3342A0:
-               priv->sifs -= 3;
-               priv->difs -= 3;
-               break;
-       case RF_MAXIM2829:
-               if (priv->bb_type == BB_TYPE_11A) {
-                       priv->sifs -= 5;
-                       priv->difs -= 5;
-               } else {
-                       priv->sifs -= 2;
-                       priv->difs -= 2;
-               }
-
-               break;
-       }
-
        data[0] = (u8)priv->sifs;
        data[1] = (u8)priv->difs;
        data[2] = (u8)priv->eifs;