]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: vt6656: clean up and rename wFB_Opt1 to vnt_fb_opt1
authorMalcolm Priestley <tvboxspy@gmail.com>
Fri, 11 Jul 2014 00:08:27 +0000 (01:08 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 12 Jul 2014 00:34:27 +0000 (17:34 -0700)
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/rxtx.c

index 6ca2638056854c076107ddb3d5eacc9a9efd4ebf..582bc1f1ad2dad7eee963513514f5602af562984 100644 (file)
@@ -62,10 +62,10 @@ static const u16 vnt_fb_opt0[2][5] = {
        {RATE_12M, RATE_12M, RATE_18M, RATE_24M, RATE_36M}, /* fallback_rate1 */
 };
 
-static const u16 wFB_Opt1[2][5] = {
-        {RATE_12M, RATE_18M, RATE_24M, RATE_24M, RATE_36M}, // fallback_rate0
-        {RATE_6M , RATE_6M,  RATE_12M, RATE_12M, RATE_18M}, // fallback_rate1
-    };
+static const u16 vnt_fb_opt1[2][5] = {
+       {RATE_12M, RATE_18M, RATE_24M, RATE_24M, RATE_36M}, /* fallback_rate0 */
+       {RATE_6M , RATE_6M,  RATE_12M, RATE_12M, RATE_18M}, /* fallback_rate1 */
+};
 
 #define RTSDUR_BB       0
 #define RTSDUR_BA       1
@@ -933,9 +933,9 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
                        tx_buffer_head->wFIFOCtl |= FIFOCTL_AUTO_FB_1;
 
                        priv->tx_rate_fb0 =
-                               wFB_Opt1[FB_RATE0][current_rate - RATE_18M];
+                               vnt_fb_opt1[FB_RATE0][current_rate - RATE_18M];
                        priv->tx_rate_fb1 =
-                               wFB_Opt1[FB_RATE1][current_rate - RATE_18M];
+                               vnt_fb_opt1[FB_RATE1][current_rate - RATE_18M];
 
                        fb_option = AUTO_FB_1;
                }