Merge tag 'arc-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

[firefly-linux-kernel-4.4.55.git] / drivers / staging / vt6655 / rxtx.c

diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 6ae859404553800c188fd2b94039f195e7d554f1..61c39dd7ad013c9e40b784c70414fac62bac908b 100644 (file)
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -50,15 +50,9 @@
 
 #include "device.h"
 #include "rxtx.h"
-#include "tether.h"
 #include "card.h"
-#include "bssdb.h"
 #include "mac.h"
 #include "baseband.h"
-#include "michael.h"
-#include "tkip.h"
-#include "tcrc.h"
-#include "wctl.h"
 #include "rf.h"
 
 /*---------------------  Static Definitions -------------------------*/
@@ -135,10 +129,9 @@ s_vGenerateTxParameter(
 
 static unsigned int
 s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
-                 unsigned char *pbyTxBufferAddr, unsigned int cbFrameBodySize,
+                 unsigned char *pbyTxBufferAddr,
                  unsigned int uDMAIdx, PSTxDesc pHeadTD,
-                 unsigned char *pPacket, unsigned int uNodeIndex,
-                 unsigned int *puMACfragNum);
+                 unsigned int uNodeIndex);
 
 static
 __le16
@@ -1037,10 +1030,9 @@ s_vGenerateTxParameter(
 
 static unsigned int
 s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
-                 unsigned char *pbyTxBufferAddr, unsigned int cbFrameBodySize,
+                 unsigned char *pbyTxBufferAddr,
                  unsigned int uDMAIdx, PSTxDesc pHeadTD,
-                 unsigned char *pPacket, unsigned int is_pspoll,
-                 unsigned int *puMACfragNum)
+                 unsigned int is_pspoll)
 {
        PDEVICE_TD_INFO td_info = pHeadTD->pTDInfo;
        struct sk_buff *skb = td_info->skb;
@@ -1203,12 +1195,12 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
 
        hdr->duration_id = uDuration;
 
-       cbReqCount = cbHeaderLength + uPadding + cbFrameBodySize;
+       cbReqCount = cbHeaderLength + uPadding + skb->len;
        pbyBuffer = (unsigned char *)pHeadTD->pTDInfo->buf;
        uLength = cbHeaderLength + uPadding;
 
        /* Copy the Packet into a tx Buffer */
-       memcpy((pbyBuffer + uLength), pPacket, cbFrameBodySize);
+       memcpy((pbyBuffer + uLength), skb->data, skb->len);
 
        ptdCurr = (PSTxDesc)pHeadTD;
 
@@ -1220,8 +1212,6 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
        ptdCurr->m_td1TD1.byTCR |= (TCR_STP | TCR_EDP | EDMSDU);
        ptdCurr->m_td1TD1.wReqCount = cpu_to_le16((unsigned short)(cbReqCount));
 
-       *puMACfragNum = uMACfragNum;
-
        return cbHeaderLength;
 }
 
@@ -1303,7 +1293,6 @@ int vnt_generate_fifo_header(struct vnt_private *priv, u32 dma_idx,
        struct ieee80211_hdr *hdr;
        struct vnt_tx_fifo_head *tx_buffer_head =
                        (struct vnt_tx_fifo_head *)td_info->buf;
-       u32 frag;
        u16 tx_body_size = skb->len, current_rate;
        u8 pkt_type;
        bool is_pspoll = false;
@@ -1409,9 +1398,8 @@ int vnt_generate_fifo_header(struct vnt_private *priv, u32 dma_idx,
 
        tx_buffer_head->frag_ctl |= cpu_to_le16(FRAGCTL_NONFRAG);
 
-       s_cbFillTxBufHead(priv, pkt_type, (u8 *)tx_buffer_head, skb->len,
-                         dma_idx, head_td, (u8 *)skb->data,
-                         is_pspoll, &frag);
+       s_cbFillTxBufHead(priv, pkt_type, (u8 *)tx_buffer_head,
+                         dma_idx, head_td, is_pspoll);
 
        if (info->control.hw_key) {
                tx_key = info->control.hw_key;
@@ -1527,7 +1515,7 @@ int vnt_beacon_enable(struct vnt_private *priv, struct ieee80211_vif *vif,
 
        VNSvOutPortB(priv->PortOffset + MAC_REG_TFTCTL, TFTCTL_TSFCNTREN);
 
-       CARDvSetFirstNextTBTT(priv->PortOffset, conf->beacon_int);
+       CARDvSetFirstNextTBTT(priv, conf->beacon_int);
 
        CARDbSetBeaconPeriod(priv, conf->beacon_int);