Commit 1bdee706 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman

staging: vt6656: parse cts fall back out of vnt_fill_cts_head

Creating new function vnt_fill_cts_fb_head for the fall back rates.

The check for fb_option is now done in vnt_rxtx_cts.

This fixes checkpatch warning
WARNING: else is not generally useful after a break or return
	559: FILE: drivers/staging/vt6656/rxtx.c:559:
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5c9b063a
...@@ -518,19 +518,18 @@ static u16 vnt_rxtx_rts_a_fb_head(struct vnt_usb_send_context *tx_context, ...@@ -518,19 +518,18 @@ static u16 vnt_rxtx_rts_a_fb_head(struct vnt_usb_send_context *tx_context,
return vnt_rxtx_datahead_a_fb(tx_context, &buf->data_head); return vnt_rxtx_datahead_a_fb(tx_context, &buf->data_head);
} }
static u16 vnt_fill_cts_head(struct vnt_usb_send_context *tx_context, static u16 vnt_fill_cts_fb_head(struct vnt_usb_send_context *tx_context,
union vnt_tx_data_head *head) union vnt_tx_data_head *head)
{ {
struct vnt_private *priv = tx_context->priv; struct vnt_private *priv = tx_context->priv;
struct vnt_cts_fb *buf = &head->cts_g_fb;
u32 cts_frame_len = 14; u32 cts_frame_len = 14;
u16 current_rate = tx_context->tx_rate; u16 current_rate = tx_context->tx_rate;
if (tx_context->fb_option) {
/* Auto Fall back */
struct vnt_cts_fb *buf = &head->cts_g_fb;
/* Get SignalField,ServiceField,Length */ /* Get SignalField,ServiceField,Length */
vnt_get_phy_field(priv, cts_frame_len, vnt_get_phy_field(priv, cts_frame_len, priv->top_cck_basic_rate,
priv->top_cck_basic_rate, PK_TYPE_11B, &buf->b); PK_TYPE_11B, &buf->b);
buf->duration_ba = buf->duration_ba =
vnt_get_rtscts_duration_le(tx_context, CTSDUR_BA, vnt_get_rtscts_duration_le(tx_context, CTSDUR_BA,
tx_context->pkt_type, tx_context->pkt_type,
...@@ -553,11 +552,19 @@ static u16 vnt_fill_cts_head(struct vnt_usb_send_context *tx_context, ...@@ -553,11 +552,19 @@ static u16 vnt_fill_cts_head(struct vnt_usb_send_context *tx_context,
ether_addr_copy(buf->data.ra, priv->current_net_addr); ether_addr_copy(buf->data.ra, priv->current_net_addr);
return vnt_rxtx_datahead_g_fb(tx_context, &buf->data_head); return vnt_rxtx_datahead_g_fb(tx_context, &buf->data_head);
} else { }
static u16 vnt_fill_cts_head(struct vnt_usb_send_context *tx_context,
union vnt_tx_data_head *head)
{
struct vnt_private *priv = tx_context->priv;
struct vnt_cts *buf = &head->cts_g; struct vnt_cts *buf = &head->cts_g;
u32 cts_frame_len = 14;
u16 current_rate = tx_context->tx_rate;
/* Get SignalField,ServiceField,Length */ /* Get SignalField,ServiceField,Length */
vnt_get_phy_field(priv, cts_frame_len, vnt_get_phy_field(priv, cts_frame_len, priv->top_cck_basic_rate,
priv->top_cck_basic_rate, PK_TYPE_11B, &buf->b); PK_TYPE_11B, &buf->b);
/* Get CTSDuration_ba */ /* Get CTSDuration_ba */
buf->duration_ba = buf->duration_ba =
vnt_get_rtscts_duration_le(tx_context, CTSDUR_BA, vnt_get_rtscts_duration_le(tx_context, CTSDUR_BA,
...@@ -571,7 +578,6 @@ static u16 vnt_fill_cts_head(struct vnt_usb_send_context *tx_context, ...@@ -571,7 +578,6 @@ static u16 vnt_fill_cts_head(struct vnt_usb_send_context *tx_context,
ether_addr_copy(buf->data.ra, priv->current_net_addr); ether_addr_copy(buf->data.ra, priv->current_net_addr);
return vnt_rxtx_datahead_g(tx_context, &buf->data_head); return vnt_rxtx_datahead_g(tx_context, &buf->data_head);
}
} }
static u16 vnt_rxtx_rts(struct vnt_usb_send_context *tx_context, static u16 vnt_rxtx_rts(struct vnt_usb_send_context *tx_context,
...@@ -628,6 +634,9 @@ static u16 vnt_rxtx_cts(struct vnt_usb_send_context *tx_context, ...@@ -628,6 +634,9 @@ static u16 vnt_rxtx_cts(struct vnt_usb_send_context *tx_context,
head = &tx_head->tx_cts.tx.mic.head; head = &tx_head->tx_cts.tx.mic.head;
/* Fill CTS */ /* Fill CTS */
if (tx_context->fb_option)
return vnt_fill_cts_fb_head(tx_context, head);
return vnt_fill_cts_head(tx_context, head); return vnt_fill_cts_head(tx_context, head);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment