From bed02d93a1e3d6880982f9429aa75334afd29851 Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Sat, 17 Oct 2015 11:32:58 +0100 Subject: staging: vt6655: replace typedef struct __device_opt with struct vnt_options and members rx_descs0 for nRxDescs0 rx_descs1 for nRxDescs1 tx_descs for nTxDescs int_works short_retry long_retry bbp_type flags Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6655/card.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers/staging/vt6655/card.c') diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 5c7f07e183c7..71c9b97634ea 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -523,12 +523,12 @@ CARDvSafeResetTx( for (uu = 0; uu < TYPE_MAXTD; uu++) pDevice->iTDUsed[uu] = 0; - for (uu = 0; uu < pDevice->sOpts.nTxDescs[0]; uu++) { + for (uu = 0; uu < pDevice->sOpts.tx_descs[0]; uu++) { pCurrTD = &(pDevice->apTD0Rings[uu]); pCurrTD->td0.owner = OWNED_BY_HOST; /* init all Tx Packet pointer to NULL */ } - for (uu = 0; uu < pDevice->sOpts.nTxDescs[1]; uu++) { + for (uu = 0; uu < pDevice->sOpts.tx_descs[1]; uu++) { pCurrTD = &(pDevice->apTD1Rings[uu]); pCurrTD->td0.owner = OWNED_BY_HOST; /* init all Tx Packet pointer to NULL */ @@ -571,7 +571,7 @@ CARDvSafeResetRx( pDevice->pCurrRD[1] = &(pDevice->aRD1Ring[0]); /* init state, all RD is chip's */ - for (uu = 0; uu < pDevice->sOpts.nRxDescs0; uu++) { + for (uu = 0; uu < pDevice->sOpts.rx_descs0; uu++) { pDesc = &(pDevice->aRD0Ring[uu]); pDesc->rd0.res_count = cpu_to_le16(pDevice->rx_buf_sz); pDesc->rd0.owner = OWNED_BY_NIC; @@ -579,7 +579,7 @@ CARDvSafeResetRx( } /* init state, all RD is chip's */ - for (uu = 0; uu < pDevice->sOpts.nRxDescs1; uu++) { + for (uu = 0; uu < pDevice->sOpts.rx_descs1; uu++) { pDesc = &(pDevice->aRD1Ring[uu]); pDesc->rd0.res_count = cpu_to_le16(pDevice->rx_buf_sz); pDesc->rd0.owner = OWNED_BY_NIC; -- cgit v1.2.3