Commit bc667b99 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman

staging: vt6655: rename pOpts and sOpts to opts.

bring pointers and members into line.
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 068b9988
...@@ -523,12 +523,12 @@ CARDvSafeResetTx( ...@@ -523,12 +523,12 @@ CARDvSafeResetTx(
for (uu = 0; uu < TYPE_MAXTD; uu++) for (uu = 0; uu < TYPE_MAXTD; uu++)
pDevice->iTDUsed[uu] = 0; pDevice->iTDUsed[uu] = 0;
for (uu = 0; uu < pDevice->sOpts.tx_descs[0]; uu++) { for (uu = 0; uu < pDevice->opts.tx_descs[0]; uu++) {
pCurrTD = &(pDevice->apTD0Rings[uu]); pCurrTD = &(pDevice->apTD0Rings[uu]);
pCurrTD->td0.owner = OWNED_BY_HOST; pCurrTD->td0.owner = OWNED_BY_HOST;
/* init all Tx Packet pointer to NULL */ /* init all Tx Packet pointer to NULL */
} }
for (uu = 0; uu < pDevice->sOpts.tx_descs[1]; uu++) { for (uu = 0; uu < pDevice->opts.tx_descs[1]; uu++) {
pCurrTD = &(pDevice->apTD1Rings[uu]); pCurrTD = &(pDevice->apTD1Rings[uu]);
pCurrTD->td0.owner = OWNED_BY_HOST; pCurrTD->td0.owner = OWNED_BY_HOST;
/* init all Tx Packet pointer to NULL */ /* init all Tx Packet pointer to NULL */
...@@ -571,7 +571,7 @@ CARDvSafeResetRx( ...@@ -571,7 +571,7 @@ CARDvSafeResetRx(
pDevice->pCurrRD[1] = &(pDevice->aRD1Ring[0]); pDevice->pCurrRD[1] = &(pDevice->aRD1Ring[0]);
/* init state, all RD is chip's */ /* init state, all RD is chip's */
for (uu = 0; uu < pDevice->sOpts.rx_descs0; uu++) { for (uu = 0; uu < pDevice->opts.rx_descs0; uu++) {
pDesc = &(pDevice->aRD0Ring[uu]); pDesc = &(pDevice->aRD0Ring[uu]);
pDesc->rd0.res_count = cpu_to_le16(pDevice->rx_buf_sz); pDesc->rd0.res_count = cpu_to_le16(pDevice->rx_buf_sz);
pDesc->rd0.owner = OWNED_BY_NIC; pDesc->rd0.owner = OWNED_BY_NIC;
...@@ -579,7 +579,7 @@ CARDvSafeResetRx( ...@@ -579,7 +579,7 @@ CARDvSafeResetRx(
} }
/* init state, all RD is chip's */ /* init state, all RD is chip's */
for (uu = 0; uu < pDevice->sOpts.rx_descs1; uu++) { for (uu = 0; uu < pDevice->opts.rx_descs1; uu++) {
pDesc = &(pDevice->aRD1Ring[uu]); pDesc = &(pDevice->aRD1Ring[uu]);
pDesc->rd0.res_count = cpu_to_le16(pDevice->rx_buf_sz); pDesc->rd0.res_count = cpu_to_le16(pDevice->rx_buf_sz);
pDesc->rd0.owner = OWNED_BY_NIC; pDesc->rd0.owner = OWNED_BY_NIC;
......
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
/* BUILD OBJ mode */ /* BUILD OBJ mode */
#define AVAIL_TD(p, q) ((p)->sOpts.tx_descs[(q)] - ((p)->iTDUsed[(q)])) #define AVAIL_TD(p, q) ((p)->opts.tx_descs[(q)] - ((p)->iTDUsed[(q)]))
/* 0:11A 1:11B 2:11G */ /* 0:11A 1:11B 2:11G */
#define BB_TYPE_11A 0 #define BB_TYPE_11A 0
...@@ -159,7 +159,7 @@ struct vnt_private { ...@@ -159,7 +159,7 @@ struct vnt_private {
struct vnt_rx_desc *aRD1Ring; struct vnt_rx_desc *aRD1Ring;
struct vnt_rx_desc *pCurrRD[TYPE_MAXRD]; struct vnt_rx_desc *pCurrRD[TYPE_MAXRD];
struct vnt_options sOpts; struct vnt_options opts;
u32 flags; u32 flags;
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment