#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 -------------------------*/
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
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;
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;
ptdCurr->m_td1TD1.byTCR |= (TCR_STP | TCR_EDP | EDMSDU);
ptdCurr->m_td1TD1.wReqCount = cpu_to_le16((unsigned short)(cbReqCount));
- *puMACfragNum = uMACfragNum;
-
return cbHeaderLength;
}
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;
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;
VNSvOutPortB(priv->PortOffset + MAC_REG_TFTCTL, TFTCTL_TSFCNTREN);
- CARDvSetFirstNextTBTT(priv->PortOffset, conf->beacon_int);
+ CARDvSetFirstNextTBTT(priv, conf->beacon_int);
CARDbSetBeaconPeriod(priv, conf->beacon_int);