aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2014-11-29 00:02:03 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-12-02 16:35:11 -0800
commit19f3ed3f1eaae4732f6c0baea8ebc6ebb1a4489d (patch)
tree2d78d32a732ca9afe3c96e0a305619243c322f5f /drivers
parent154bb8bd43cfe4d714c39e09b820427612f40bde (diff)
staging: vt6655: s_cbFillTxBufHead remove parameter cbFrameBodySize
skb->len is available locally use that instead. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/vt6655/rxtx.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 9d169166fe2b..61c39dd7ad01 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -129,7 +129,7 @@ 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 int uNodeIndex);
@@ -1030,7 +1030,7 @@ 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 int is_pspoll)
{
@@ -1195,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), skb->data, cbFrameBodySize);
+ memcpy((pbyBuffer + uLength), skb->data, skb->len);
ptdCurr = (PSTxDesc)pHeadTD;
@@ -1398,7 +1398,7 @@ 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,
+ s_cbFillTxBufHead(priv, pkt_type, (u8 *)tx_buffer_head,
dma_idx, head_td, is_pspoll);
if (info->control.hw_key) {

Privacy Policy