|
@@ -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;
|