diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2009-11-28 05:36:04 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-28 23:58:54 -0800 |
| commit | daeda6309e1382819a8f8bab548560742ac26cc2 (patch) | |
| tree | 164dbcb3c1e96662c7efbe4b22a39630de9ede3c /drivers/net/sfc/falcon.h | |
| parent | 299f8d69f3590fdbd7b22880234196de3b39ceca (diff) | |
| download | blackbird-obmc-linux-daeda6309e1382819a8f8bab548560742ac26cc2.tar.gz blackbird-obmc-linux-daeda6309e1382819a8f8bab548560742ac26cc2.zip | |
sfc: Decouple NIC revision number from Falcon PCI revision number
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/falcon.h')
| -rw-r--r-- | drivers/net/sfc/falcon.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/sfc/falcon.h b/drivers/net/sfc/falcon.h index a561f6758bc6..81196a0fb504 100644 --- a/drivers/net/sfc/falcon.h +++ b/drivers/net/sfc/falcon.h @@ -19,15 +19,15 @@ * Falcon hardware control */ -enum falcon_revision { - FALCON_REV_A0 = 0, - FALCON_REV_A1 = 1, - FALCON_REV_B0 = 2, +enum { + EFX_REV_FALCON_A0 = 0, + EFX_REV_FALCON_A1 = 1, + EFX_REV_FALCON_B0 = 2, }; -static inline int falcon_rev(struct efx_nic *efx) +static inline int efx_nic_rev(struct efx_nic *efx) { - return efx->pci_dev->revision; + return efx->type->revision; } /** @@ -95,8 +95,8 @@ static inline struct falcon_board *falcon_board(struct efx_nic *efx) return &data->board; } -extern struct efx_nic_type falcon_a_nic_type; -extern struct efx_nic_type falcon_b_nic_type; +extern struct efx_nic_type falcon_a1_nic_type; +extern struct efx_nic_type falcon_b0_nic_type; /************************************************************************** * |
