aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2014-11-28 19:02:01 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-12-02 19:35:10 -0500
commit4b71166d786cb38974b4e0d2021446e128a17cd1 (patch)
tree459ebad43524f89802f2401ee5c82ead8b320699 /drivers/staging
parent4a7f0cff0592d9aaea8b211fc1cab6d8e8404c82 (diff)
staging: vt6655: s_cbFillTxBufHead remove unused parameter *puMACfragNum
*puMACfragNum was part of old legacy functions. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/vt6655/rxtx.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 4189405bb238..f1dacf9e9c46 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -131,8 +131,7 @@ static unsigned int
131s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType, 131s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
132 unsigned char *pbyTxBufferAddr, unsigned int cbFrameBodySize, 132 unsigned char *pbyTxBufferAddr, unsigned int cbFrameBodySize,
133 unsigned int uDMAIdx, PSTxDesc pHeadTD, 133 unsigned int uDMAIdx, PSTxDesc pHeadTD,
134 unsigned char *pPacket, unsigned int uNodeIndex, 134 unsigned char *pPacket, unsigned int uNodeIndex);
135 unsigned int *puMACfragNum);
136 135
137static 136static
138__le16 137__le16
@@ -1033,8 +1032,7 @@ static unsigned int
1033s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType, 1032s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
1034 unsigned char *pbyTxBufferAddr, unsigned int cbFrameBodySize, 1033 unsigned char *pbyTxBufferAddr, unsigned int cbFrameBodySize,
1035 unsigned int uDMAIdx, PSTxDesc pHeadTD, 1034 unsigned int uDMAIdx, PSTxDesc pHeadTD,
1036 unsigned char *pPacket, unsigned int is_pspoll, 1035 unsigned char *pPacket, unsigned int is_pspoll)
1037 unsigned int *puMACfragNum)
1038{ 1036{
1039 PDEVICE_TD_INFO td_info = pHeadTD->pTDInfo; 1037 PDEVICE_TD_INFO td_info = pHeadTD->pTDInfo;
1040 struct sk_buff *skb = td_info->skb; 1038 struct sk_buff *skb = td_info->skb;
@@ -1214,8 +1212,6 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned char byPktType,
1214 ptdCurr->m_td1TD1.byTCR |= (TCR_STP | TCR_EDP | EDMSDU); 1212 ptdCurr->m_td1TD1.byTCR |= (TCR_STP | TCR_EDP | EDMSDU);
1215 ptdCurr->m_td1TD1.wReqCount = cpu_to_le16((unsigned short)(cbReqCount)); 1213 ptdCurr->m_td1TD1.wReqCount = cpu_to_le16((unsigned short)(cbReqCount));
1216 1214
1217 *puMACfragNum = uMACfragNum;
1218
1219 return cbHeaderLength; 1215 return cbHeaderLength;
1220} 1216}
1221 1217
@@ -1297,7 +1293,6 @@ int vnt_generate_fifo_header(struct vnt_private *priv, u32 dma_idx,
1297 struct ieee80211_hdr *hdr; 1293 struct ieee80211_hdr *hdr;
1298 struct vnt_tx_fifo_head *tx_buffer_head = 1294 struct vnt_tx_fifo_head *tx_buffer_head =
1299 (struct vnt_tx_fifo_head *)td_info->buf; 1295 (struct vnt_tx_fifo_head *)td_info->buf;
1300 u32 frag;
1301 u16 tx_body_size = skb->len, current_rate; 1296 u16 tx_body_size = skb->len, current_rate;
1302 u8 pkt_type; 1297 u8 pkt_type;
1303 bool is_pspoll = false; 1298 bool is_pspoll = false;
@@ -1405,7 +1400,7 @@ int vnt_generate_fifo_header(struct vnt_private *priv, u32 dma_idx,
1405 1400
1406 s_cbFillTxBufHead(priv, pkt_type, (u8 *)tx_buffer_head, skb->len, 1401 s_cbFillTxBufHead(priv, pkt_type, (u8 *)tx_buffer_head, skb->len,
1407 dma_idx, head_td, (u8 *)skb->data, 1402 dma_idx, head_td, (u8 *)skb->data,
1408 is_pspoll, &frag); 1403 is_pspoll);
1409 1404
1410 if (info->control.hw_key) { 1405 if (info->control.hw_key) {
1411 tx_key = info->control.hw_key; 1406 tx_key = info->control.hw_key;