diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2015-10-17 13:32:58 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-17 19:04:27 +0300 |
| commit | bed02d93a1e3d6880982f9429aa75334afd29851 (patch) | |
| tree | d9cf44c9bfa79048b7ee56951080ec46e9a78dad /drivers/staging/vt6655/device.h | |
| parent | 28c777cb1f828197b3896c6d549e6e091e68e36c (diff) | |
| download | linux-bed02d93a1e3d6880982f9429aa75334afd29851.tar.xz | |
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 <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6655/device.h')
| -rw-r--r-- | drivers/staging/vt6655/device.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index 83bb68bb66ee..aca6e00a368b 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -85,7 +85,7 @@ /* BUILD OBJ mode */ -#define AVAIL_TD(p, q) ((p)->sOpts.nTxDescs[(q)] - ((p)->iTDUsed[(q)])) +#define AVAIL_TD(p, q) ((p)->sOpts.tx_descs[(q)] - ((p)->iTDUsed[(q)])) /* 0:11A 1:11B 2:11G */ #define BB_TYPE_11A 0 @@ -101,16 +101,16 @@ #define OWNED_BY_HOST 0 #define OWNED_BY_NIC 1 -typedef struct __device_opt { - int nRxDescs0; /* Number of RX descriptors0 */ - int nRxDescs1; /* Number of RX descriptors1 */ - int nTxDescs[2]; /* Number of TX descriptors 0, 1 */ - int int_works; /* interrupt limits */ - int short_retry; - int long_retry; - int bbp_type; - u32 flags; -} OPTIONS, *POPTIONS; +struct vnt_options { + int rx_descs0; /* Number of RX descriptors0 */ + int rx_descs1; /* Number of RX descriptors1 */ + int tx_descs[2]; /* Number of TX descriptors 0, 1 */ + int int_works; /* interrupt limits */ + int short_retry; + int long_retry; + int bbp_type; + u32 flags; +}; struct vnt_private { struct pci_dev *pcid; @@ -159,7 +159,7 @@ struct vnt_private { struct vnt_rx_desc *aRD1Ring; struct vnt_rx_desc *pCurrRD[TYPE_MAXRD]; - OPTIONS sOpts; + struct vnt_options sOpts; u32 flags; |