diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-07-11 01:08:26 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-11 17:34:27 -0700 |
| commit | e3f318744c0c1db01a3edbb1497906ce17b2f9dc (patch) | |
| tree | e2b4e2fc7e2710b11411022a810e25afd29ad632 /drivers/staging/vt6656/rxtx.c | |
| parent | 1a4d4509271e1039d06e860b802ec8a9e5fd2b6d (diff) | |
staging: vt6656: clean up and rename wFB_Opt0 to vnt_fb_opt0
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656/rxtx.c')
| -rw-r--r-- | drivers/staging/vt6656/rxtx.c | 13 |
1 files 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) { |