Commit a974fb37 authored by Salvatore Benedetto's avatar Salvatore Benedetto Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: rtxt.c Fix PARENTHESIS_ALIGNMENT type errors 



Fix all PARENTHESIS_ALIGNMENT type errors reported by checkpatch
in rtxt.c

Signed-off-by: default avatarSalvatore Benedetto <salvatore.benedetto@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2fc0b7dd

drivers/staging/vt6656/rxtx.c

+37 −33
Original line number Diff line number Diff line
@@ -141,8 +141,9 @@ static __le16 vnt_rxtx_rsvtime_le16(struct vnt_private *priv, u8 pkt_type, 
		frame_length, rate, need_ack));

}



static __le16 vnt_get_rtscts_rsvtime_le(struct vnt_private *priv,

					 u8 rsv_type, u8 pkt_type, u32 frame_length, u16 current_rate)

static __le16 vnt_get_rtscts_rsvtime_le(struct vnt_private *priv, u8 rsv_type,

					u8 pkt_type, u32 frame_length,

					u16 current_rate)

{

	u32 rrv_time, rts_time, cts_time, ack_time, data_time;
@@ -152,13 +153,14 @@ static __le16 vnt_get_rtscts_rsvtime_le(struct vnt_private *priv, 
				       frame_length, current_rate);



	if (rsv_type == 0) {

		rts_time = vnt_get_frame_time(priv->preamble_type,

			pkt_type, 20, priv->top_cck_basic_rate);

		rts_time = vnt_get_frame_time(priv->preamble_type, pkt_type,

					      20, priv->top_cck_basic_rate);

		cts_time = ack_time = vnt_get_frame_time(priv->preamble_type,

			pkt_type, 14, priv->top_cck_basic_rate);

							 pkt_type, 14,

							 priv->top_cck_basic_rate);

	} else if (rsv_type == 1) {

		rts_time = vnt_get_frame_time(priv->preamble_type,

			pkt_type, 20, priv->top_cck_basic_rate);

		rts_time = vnt_get_frame_time(priv->preamble_type, pkt_type,

					      20, priv->top_cck_basic_rate);

		cts_time = vnt_get_frame_time(priv->preamble_type, pkt_type,

					      14, priv->top_cck_basic_rate);

		ack_time = vnt_get_frame_time(priv->preamble_type, pkt_type,
@@ -184,18 +186,20 @@ static __le16 vnt_get_rtscts_rsvtime_le(struct vnt_private *priv, 
	return cpu_to_le16((u16)rrv_time);

}



static __le16 vnt_get_duration_le(struct vnt_private *priv,

				   u8 pkt_type, int need_ack)

static __le16 vnt_get_duration_le(struct vnt_private *priv, u8 pkt_type,

				  int need_ack)

{

	u32 ack_time = 0;



	if (need_ack) {

		if (pkt_type == PK_TYPE_11B)

			ack_time = vnt_get_frame_time(priv->preamble_type,

				pkt_type, 14, priv->top_cck_basic_rate);

						      pkt_type, 14,

						      priv->top_cck_basic_rate);

		else

			ack_time = vnt_get_frame_time(priv->preamble_type,

				pkt_type, 14, priv->top_ofdm_basic_rate);

						      pkt_type, 14,

						      priv->top_ofdm_basic_rate);



		return cpu_to_le16((u16)(priv->sifs + ack_time));

	}
@@ -216,8 +220,8 @@ static __le16 vnt_get_rtscts_duration_le(struct vnt_usb_send_context *context, 
	case RTSDUR_BA:

	case RTSDUR_BA_F0:

	case RTSDUR_BA_F1:

		cts_time = vnt_get_frame_time(priv->preamble_type,

				pkt_type, 14, priv->top_cck_basic_rate);

		cts_time = vnt_get_frame_time(priv->preamble_type, pkt_type,

					      14, priv->top_cck_basic_rate);

		dur_time = cts_time + 2 * priv->sifs +

			vnt_get_rsvtime(priv, pkt_type,

					frame_length, rate, need_ack);
@@ -226,8 +230,8 @@ static __le16 vnt_get_rtscts_duration_le(struct vnt_usb_send_context *context, 
	case RTSDUR_AA:

	case RTSDUR_AA_F0:

	case RTSDUR_AA_F1:

		cts_time = vnt_get_frame_time(priv->preamble_type,

					      pkt_type, 14, priv->top_ofdm_basic_rate);

		cts_time = vnt_get_frame_time(priv->preamble_type, pkt_type,

					      14, priv->top_ofdm_basic_rate);

		dur_time = cts_time + 2 * priv->sifs +

			vnt_get_rsvtime(priv, pkt_type,

					frame_length, rate, need_ack);
@@ -499,8 +503,8 @@ static u16 vnt_rxtx_rts_a_fb_head(struct vnt_usb_send_context *tx_context, 
	u16 current_rate = tx_context->tx_rate;

	u16 rts_frame_len = 20;



	vnt_get_phy_field(priv, rts_frame_len,

		priv->top_ofdm_basic_rate, tx_context->pkt_type, &buf->a);

	vnt_get_phy_field(priv, rts_frame_len, priv->top_ofdm_basic_rate,

			  tx_context->pkt_type, &buf->a);



	buf->duration = vnt_get_rtscts_duration_le(tx_context, RTSDUR_AA,

						   tx_context->pkt_type,
@@ -712,8 +716,9 @@ static u16 vnt_generate_tx_parameter(struct vnt_usb_send_context *tx_context, 
}



static void vnt_fill_txkey(struct vnt_usb_send_context *tx_context,

	u8 *key_buffer, struct ieee80211_key_conf *tx_key, struct sk_buff *skb,

	u16 payload_len, struct vnt_mic_hdr *mic_hdr)

			   u8 *key_buffer, struct ieee80211_key_conf *tx_key,

			   struct sk_buff *skb, u16 payload_len,

			   struct vnt_mic_hdr *mic_hdr)

{

	struct ieee80211_hdr *hdr = tx_context->hdr;

	u64 pn64;
@@ -991,8 +996,7 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb) 
	return 0;

}



static int vnt_beacon_xmit(struct vnt_private *priv,

	struct sk_buff *skb)

static int vnt_beacon_xmit(struct vnt_private *priv, struct sk_buff *skb)

{

	struct vnt_beacon_buffer *beacon_buffer;

	struct vnt_tx_short_buf_head *short_head;