diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-11-29 00:02:02 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-02 16:35:10 -0800 |
| commit | 154bb8bd43cfe4d714c39e09b820427612f40bde (patch) | |
| tree | 841e40951c2ef32b89dfe201235f9d1328829d64 /drivers/staging/vt6655/rxtx.c | |
| parent | 4b71166d786cb38974b4e0d2021446e128a17cd1 (diff) | |
| download | op-kernel-dev-154bb8bd43cfe4d714c39e09b820427612f40bde.zip op-kernel-dev-154bb8bd43cfe4d714c39e09b820427612f40bde.tar.gz | |
staging: vt6655: s_cbFillTxBufHead remove parameter *pPacket
skb->data is available locally so use that instead.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6655/rxtx.c')
| -rw-r--r-- | drivers/staging/vt6655/rxtx.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c index f1dacf9..9d16916 100644 --- a/drivers/staging/vt6655/rxtx.c +++ b/drivers/staging/vt6655/rxtx.c @@ -131,7 +131,7 @@ static unsigned int s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType, unsigned char *pbyTxBufferAddr, unsigned int cbFrameBodySize, unsigned int uDMAIdx, PSTxDesc pHeadTD, - unsigned char *pPacket, unsigned int uNodeIndex); + unsigned int uNodeIndex); static __le16 @@ -1032,7 +1032,7 @@ static unsigned int s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType, unsigned char *pbyTxBufferAddr, unsigned int cbFrameBodySize, unsigned int uDMAIdx, PSTxDesc pHeadTD, - unsigned char *pPacket, unsigned int is_pspoll) + unsigned int is_pspoll) { PDEVICE_TD_INFO td_info = pHeadTD->pTDInfo; struct sk_buff *skb = td_info->skb; @@ -1200,7 +1200,7 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType, uLength = cbHeaderLength + uPadding; /* Copy the Packet into a tx Buffer */ - memcpy((pbyBuffer + uLength), pPacket, cbFrameBodySize); + memcpy((pbyBuffer + uLength), skb->data, cbFrameBodySize); ptdCurr = (PSTxDesc)pHeadTD; @@ -1399,8 +1399,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, - dma_idx, head_td, (u8 *)skb->data, - is_pspoll); + dma_idx, head_td, is_pspoll); if (info->control.hw_key) { tx_key = info->control.hw_key; |
