From: Malcolm Priestley Date: Fri, 11 Jul 2014 00:08:27 +0000 (+0100) Subject: staging: vt6656: clean up and rename wFB_Opt1 to vnt_fb_opt1 X-Git-Tag: v3.17-rc1~123^2~927 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2331ba42b5d1ff1625d17fc57d00af560063a3e0;p=karo-tx-linux.git staging: vt6656: clean up and rename wFB_Opt1 to vnt_fb_opt1 Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 6ca263805685..582bc1f1ad2d 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -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; }