From: Malcolm Priestley <tvboxspy@gmail.com>
Date: Thu, 10 Jul 2014 18:56:05 +0000 (+0100)
Subject: staging: vt6656: move current_rate setting out of s_vGenerateTxParameter
X-Git-Tag: firefly_0821_release~176^2~3491^2~961
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cb8ee9dededa4e6c7acc5715814d616c545fb095;p=firefly-linux-kernel-4.4.55.git

staging: vt6656: move current_rate setting out of s_vGenerateTxParameter

Removing unneeded pointers

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index 57e1dff68fa0..2ed045d235f6 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -657,11 +657,8 @@ static u16 s_vGenerateTxParameter(struct vnt_usb_send_context *tx_context,
 	int bNeedACK, bool need_rts)
 {
 	struct vnt_private *pDevice = tx_context->priv;
-	struct vnt_tx_fifo_head *pFifoHead = &tx_buffer->fifo_head;
 	union vnt_tx_data_head *head = NULL;
 
-	pFifoHead->current_rate = cpu_to_le16(wCurrentRate);
-
 	if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {
 		if (need_rts) {
 			struct vnt_rrv_time_rts *pBuf =
@@ -982,6 +979,8 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
 		frame_size += tx_key->icv_len;
 	}
 
+	tx_buffer_head->current_rate = cpu_to_le16(current_rate);
+
 	/* legacy rates TODO use ieee80211_tx_rate */
 	if (current_rate >= RATE_18M && ieee80211_is_data(hdr->frame_control)) {
 		if (priv->byAutoFBCtrl == AUTO_FB_0) {