]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
staging: vt6656: move current_rate setting out of s_vGenerateTxParameter
authorMalcolm Priestley <tvboxspy@gmail.com>
Thu, 10 Jul 2014 18:56:05 +0000 (19:56 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Jul 2014 22:17:14 +0000 (15:17 -0700)
Removing unneeded pointers

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6656/rxtx.c

index 57e1dff68fa097e74688f217dba7d5297130916b..2ed045d235f6ac4ad1b6a4e8120aece24266be1d 100644 (file)
@@ -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) {