From e3f318744c0c1db01a3edbb1497906ce17b2f9dc Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Fri, 11 Jul 2014 01:08:26 +0100 Subject: [PATCH] staging: vt6656: clean up and rename wFB_Opt0 to vnt_fb_opt0 Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/rxtx.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 7faef28cceb4..6ca263805685 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -57,10 +57,11 @@ static const u16 vnt_time_stampoff[2][MAX_RATE] = { {384, 192, 130, 113, 54, 43, 37, 31, 28, 25, 24, 23},/* Short Preamble */ }; -static const u16 wFB_Opt0[2][5] = { - {RATE_12M, RATE_18M, RATE_24M, RATE_36M, RATE_48M}, // fallback_rate0 - {RATE_12M, RATE_12M, RATE_18M, RATE_24M, RATE_36M}, // fallback_rate1 - }; +static const u16 vnt_fb_opt0[2][5] = { + {RATE_12M, RATE_18M, RATE_24M, RATE_36M, RATE_48M}, /* fallback_rate0 */ + {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 @@ -923,9 +924,9 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb) tx_buffer_head->wFIFOCtl |= FIFOCTL_AUTO_FB_0; priv->tx_rate_fb0 = - wFB_Opt0[FB_RATE0][current_rate - RATE_18M]; + vnt_fb_opt0[FB_RATE0][current_rate - RATE_18M]; priv->tx_rate_fb1 = - wFB_Opt0[FB_RATE1][current_rate - RATE_18M]; + vnt_fb_opt0[FB_RATE1][current_rate - RATE_18M]; fb_option = AUTO_FB_0; } else if (priv->byAutoFBCtrl == AUTO_FB_1) { -- 2.30.2