mirror of https://gitee.com/openkylin/linux.git
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>
This commit is contained in:
parent
4b71166d78
commit
154bb8bd43
|
@ -131,7 +131,7 @@ static unsigned int
|
||||||
s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
|
s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
|
||||||
unsigned char *pbyTxBufferAddr, unsigned int cbFrameBodySize,
|
unsigned char *pbyTxBufferAddr, unsigned int cbFrameBodySize,
|
||||||
unsigned int uDMAIdx, PSTxDesc pHeadTD,
|
unsigned int uDMAIdx, PSTxDesc pHeadTD,
|
||||||
unsigned char *pPacket, unsigned int uNodeIndex);
|
unsigned int uNodeIndex);
|
||||||
|
|
||||||
static
|
static
|
||||||
__le16
|
__le16
|
||||||
|
@ -1032,7 +1032,7 @@ static unsigned int
|
||||||
s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
|
s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
|
||||||
unsigned char *pbyTxBufferAddr, unsigned int cbFrameBodySize,
|
unsigned char *pbyTxBufferAddr, unsigned int cbFrameBodySize,
|
||||||
unsigned int uDMAIdx, PSTxDesc pHeadTD,
|
unsigned int uDMAIdx, PSTxDesc pHeadTD,
|
||||||
unsigned char *pPacket, unsigned int is_pspoll)
|
unsigned int is_pspoll)
|
||||||
{
|
{
|
||||||
PDEVICE_TD_INFO td_info = pHeadTD->pTDInfo;
|
PDEVICE_TD_INFO td_info = pHeadTD->pTDInfo;
|
||||||
struct sk_buff *skb = td_info->skb;
|
struct sk_buff *skb = td_info->skb;
|
||||||
|
@ -1200,7 +1200,7 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
|
||||||
uLength = cbHeaderLength + uPadding;
|
uLength = cbHeaderLength + uPadding;
|
||||||
|
|
||||||
/* Copy the Packet into a tx Buffer */
|
/* Copy the Packet into a tx Buffer */
|
||||||
memcpy((pbyBuffer + uLength), pPacket, cbFrameBodySize);
|
memcpy((pbyBuffer + uLength), skb->data, cbFrameBodySize);
|
||||||
|
|
||||||
ptdCurr = (PSTxDesc)pHeadTD;
|
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);
|
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, skb->len,
|
||||||
dma_idx, head_td, (u8 *)skb->data,
|
dma_idx, head_td, is_pspoll);
|
||||||
is_pspoll);
|
|
||||||
|
|
||||||
if (info->control.hw_key) {
|
if (info->control.hw_key) {
|
||||||
tx_key = info->control.hw_key;
|
tx_key = info->control.hw_key;
|
||||||
|
|
Loading…
Reference in New Issue