diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2013-08-29 01:45:48 +0200 |
|---|---|---|
| committer | Ben Hutchings <bhutchings@solarflare.com> | 2013-08-29 19:12:09 +0200 |
| commit | c15eed220fd1dd31d7ad2e4893b679331e6f1e74 (patch) | |
| tree | f6ac93450c6f0f22bcf4010c94f2c32f96bdc58b /drivers/net/ethernet/sfc/siena.c | |
| parent | sfc: Allow event queue initialisation to fail (diff) | |
| download | linux-c15eed220fd1dd31d7ad2e4893b679331e6f1e74.tar.xz linux-c15eed220fd1dd31d7ad2e4893b679331e6f1e74.zip | |
sfc: Allow efx_nic_type::dimension_resources to fail
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers/net/ethernet/sfc/siena.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/siena.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/siena.c b/drivers/net/ethernet/sfc/siena.c index 89180d475367..1500405b3a55 100644 --- a/drivers/net/ethernet/sfc/siena.c +++ b/drivers/net/ethernet/sfc/siena.c @@ -177,13 +177,14 @@ static int siena_probe_nvconfig(struct efx_nic *efx) return rc; } -static void siena_dimension_resources(struct efx_nic *efx) +static int siena_dimension_resources(struct efx_nic *efx) { /* Each port has a small block of internal SRAM dedicated to * the buffer table and descriptor caches. In theory we can * map both blocks to one port, but we don't. */ efx_farch_dimension_resources(efx, FR_CZ_BUF_FULL_TBL_ROWS / 2); + return 0; } static unsigned int siena_mem_map_size(struct efx_nic *efx) |