aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuan Antonio Pedreira Martos <juanpm1@gmail.com>2017-04-28 07:25:37 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-04-28 08:30:43 -0400
commitb1711c17c2633a1deb2e67589bf497afa7681e92 (patch)
tree89b1e3bf147dab787e4fd7c1856727e39a89a826
parent817bf56ae7f005fdbba2ca90788806ef3fefea9b (diff)
staging: vt6656: use tabs instead of spaces
Fix a checkpatch error: CODE_INDENT (code indent should use tabs where possible). Signed-off-by: Juan Antonio Pedreira Martos <juanpm1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/vt6656/rxtx.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index 1835cd13ef49..63413492e61d 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -114,7 +114,7 @@ static __le16 vnt_time_stamp_off(struct vnt_private *priv, u16 rate)
114} 114}
115 115
116static u32 vnt_get_rsvtime(struct vnt_private *priv, u8 pkt_type, 116static u32 vnt_get_rsvtime(struct vnt_private *priv, u8 pkt_type,
117 u32 frame_length, u16 rate, int need_ack) 117 u32 frame_length, u16 rate, int need_ack)
118{ 118{
119 u32 data_time, ack_time; 119 u32 data_time, ack_time;
120 120
@@ -135,14 +135,14 @@ static u32 vnt_get_rsvtime(struct vnt_private *priv, u8 pkt_type,
135} 135}
136 136
137static __le16 vnt_rxtx_rsvtime_le16(struct vnt_private *priv, u8 pkt_type, 137static __le16 vnt_rxtx_rsvtime_le16(struct vnt_private *priv, u8 pkt_type,
138 u32 frame_length, u16 rate, int need_ack) 138 u32 frame_length, u16 rate, int need_ack)
139{ 139{
140 return cpu_to_le16((u16)vnt_get_rsvtime(priv, pkt_type, 140 return cpu_to_le16((u16)vnt_get_rsvtime(priv, pkt_type,
141 frame_length, rate, need_ack)); 141 frame_length, rate, need_ack));
142} 142}
143 143
144static __le16 vnt_get_rtscts_rsvtime_le(struct vnt_private *priv, 144static __le16 vnt_get_rtscts_rsvtime_le(struct vnt_private *priv,
145 u8 rsv_type, u8 pkt_type, u32 frame_length, u16 current_rate) 145 u8 rsv_type, u8 pkt_type, u32 frame_length, u16 current_rate)
146{ 146{
147 u32 rrv_time, rts_time, cts_time, ack_time, data_time; 147 u32 rrv_time, rts_time, cts_time, ack_time, data_time;
148 148
@@ -160,19 +160,19 @@ static __le16 vnt_get_rtscts_rsvtime_le(struct vnt_private *priv,
160 rts_time = vnt_get_frame_time(priv->preamble_type, 160 rts_time = vnt_get_frame_time(priv->preamble_type,
161 pkt_type, 20, priv->top_cck_basic_rate); 161 pkt_type, 20, priv->top_cck_basic_rate);
162 cts_time = vnt_get_frame_time(priv->preamble_type, pkt_type, 162 cts_time = vnt_get_frame_time(priv->preamble_type, pkt_type,
163 14, priv->top_cck_basic_rate); 163 14, priv->top_cck_basic_rate);
164 ack_time = vnt_get_frame_time(priv->preamble_type, pkt_type, 164 ack_time = vnt_get_frame_time(priv->preamble_type, pkt_type,
165 14, priv->top_ofdm_basic_rate); 165 14, priv->top_ofdm_basic_rate);
166 } else if (rsv_type == 2) { 166 } else if (rsv_type == 2) {
167 rts_time = vnt_get_frame_time(priv->preamble_type, pkt_type, 167 rts_time = vnt_get_frame_time(priv->preamble_type, pkt_type,
168 20, priv->top_ofdm_basic_rate); 168 20, priv->top_ofdm_basic_rate);
169 cts_time = ack_time = vnt_get_frame_time(priv->preamble_type, 169 cts_time = ack_time = vnt_get_frame_time(priv->preamble_type,
170 pkt_type, 14, priv->top_ofdm_basic_rate); 170 pkt_type, 14, priv->top_ofdm_basic_rate);
171 } else if (rsv_type == 3) { 171 } else if (rsv_type == 3) {
172 cts_time = vnt_get_frame_time(priv->preamble_type, pkt_type, 172 cts_time = vnt_get_frame_time(priv->preamble_type, pkt_type,
173 14, priv->top_cck_basic_rate); 173 14, priv->top_cck_basic_rate);
174 ack_time = vnt_get_frame_time(priv->preamble_type, pkt_type, 174 ack_time = vnt_get_frame_time(priv->preamble_type, pkt_type,
175 14, priv->top_ofdm_basic_rate); 175 14, priv->top_ofdm_basic_rate);
176 176
177 rrv_time = cts_time + ack_time + data_time + 2 * priv->sifs; 177 rrv_time = cts_time + ack_time + data_time + 2 * priv->sifs;
178 178
@@ -227,7 +227,7 @@ static __le16 vnt_get_rtscts_duration_le(struct vnt_usb_send_context *context,
227 case RTSDUR_AA_F0: 227 case RTSDUR_AA_F0:
228 case RTSDUR_AA_F1: 228 case RTSDUR_AA_F1:
229 cts_time = vnt_get_frame_time(priv->preamble_type, 229 cts_time = vnt_get_frame_time(priv->preamble_type,
230 pkt_type, 14, priv->top_ofdm_basic_rate); 230 pkt_type, 14, priv->top_ofdm_basic_rate);
231 dur_time = cts_time + 2 * priv->sifs + 231 dur_time = cts_time + 2 * priv->sifs +
232 vnt_get_rsvtime(priv, pkt_type, 232 vnt_get_rsvtime(priv, pkt_type,
233 frame_length, rate, need_ack); 233 frame_length, rate, need_ack);
@@ -410,7 +410,7 @@ static u16 vnt_rxtx_rts_g_head(struct vnt_usb_send_context *tx_context,
410 u16 current_rate = tx_context->tx_rate; 410 u16 current_rate = tx_context->tx_rate;
411 411
412 vnt_get_phy_field(priv, rts_frame_len, priv->top_cck_basic_rate, 412 vnt_get_phy_field(priv, rts_frame_len, priv->top_cck_basic_rate,
413 PK_TYPE_11B, &buf->b); 413 PK_TYPE_11B, &buf->b);
414 vnt_get_phy_field(priv, rts_frame_len, priv->top_ofdm_basic_rate, 414 vnt_get_phy_field(priv, rts_frame_len, priv->top_ofdm_basic_rate,
415 tx_context->pkt_type, &buf->a); 415 tx_context->pkt_type, &buf->a);
416 416
@@ -437,7 +437,7 @@ static u16 vnt_rxtx_rts_g_fb_head(struct vnt_usb_send_context *tx_context,
437 u16 rts_frame_len = 20; 437 u16 rts_frame_len = 20;
438 438
439 vnt_get_phy_field(priv, rts_frame_len, priv->top_cck_basic_rate, 439 vnt_get_phy_field(priv, rts_frame_len, priv->top_cck_basic_rate,
440 PK_TYPE_11B, &buf->b); 440 PK_TYPE_11B, &buf->b);
441 vnt_get_phy_field(priv, rts_frame_len, priv->top_ofdm_basic_rate, 441 vnt_get_phy_field(priv, rts_frame_len, priv->top_ofdm_basic_rate,
442 tx_context->pkt_type, &buf->a); 442 tx_context->pkt_type, &buf->a);
443 443
@@ -683,9 +683,9 @@ static u16 vnt_rxtx_ab(struct vnt_usb_send_context *tx_context,
683} 683}
684 684
685static u16 vnt_generate_tx_parameter(struct vnt_usb_send_context *tx_context, 685static u16 vnt_generate_tx_parameter(struct vnt_usb_send_context *tx_context,
686 struct vnt_tx_buffer *tx_buffer, 686 struct vnt_tx_buffer *tx_buffer,
687 struct vnt_mic_hdr **mic_hdr, u32 need_mic, 687 struct vnt_mic_hdr **mic_hdr, u32 need_mic,
688 bool need_rts) 688 bool need_rts)
689{ 689{
690 690
691 if (tx_context->pkt_type == PK_TYPE_11GB || 691 if (tx_context->pkt_type == PK_TYPE_11GB ||
@@ -1024,7 +1024,7 @@ static int vnt_beacon_xmit(struct vnt_private *priv,
1024 1024
1025 /* Get SignalField,ServiceField,Length */ 1025 /* Get SignalField,ServiceField,Length */
1026 vnt_get_phy_field(priv, frame_size, current_rate, 1026 vnt_get_phy_field(priv, frame_size, current_rate,
1027 PK_TYPE_11A, &short_head->ab); 1027 PK_TYPE_11A, &short_head->ab);
1028 1028
1029 /* Get Duration and TimeStampOff */ 1029 /* Get Duration and TimeStampOff */
1030 short_head->duration = vnt_get_duration_le(priv, 1030 short_head->duration = vnt_get_duration_le(priv,
@@ -1101,7 +1101,7 @@ int vnt_beacon_make(struct vnt_private *priv, struct ieee80211_vif *vif)
1101} 1101}
1102 1102
1103int vnt_beacon_enable(struct vnt_private *priv, struct ieee80211_vif *vif, 1103int vnt_beacon_enable(struct vnt_private *priv, struct ieee80211_vif *vif,
1104 struct ieee80211_bss_conf *conf) 1104 struct ieee80211_bss_conf *conf)
1105{ 1105{
1106 vnt_mac_reg_bits_off(priv, MAC_REG_TCR, TCR_AUTOBCNTX); 1106 vnt_mac_reg_bits_off(priv, MAC_REG_TCR, TCR_AUTOBCNTX);
1107 1107