From ef56a8df8903f5c8ee1505339f884d463253bb8b Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 11 Sep 2012 21:46:41 +0100 Subject: [PATCH] --- yaml --- r: 328423 b: refs/heads/master c: 0a6e5008a9df678b48f8d4e57601aa4270df6c14 h: refs/heads/master i: 328421: e4d9f6c3068a4b9f723a4f55b758f0e4ba6732f2 328419: 5f0df5c496fe3fbd88b9736f9ba511801546f5ed 328415: 25cbb0d41621f5aa1251db02b99e8fc1f983b051 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/sfc/mcdi.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6b27bf723d6f..4338502573ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9724a8504c875145f5a513bb8eca50671cee23b4 +refs/heads/master: 0a6e5008a9df678b48f8d4e57601aa4270df6c14 diff --git a/trunk/drivers/net/ethernet/sfc/mcdi.h b/trunk/drivers/net/ethernet/sfc/mcdi.h index dc25caaa3983..3ba2e5b5a9cc 100644 --- a/trunk/drivers/net/ethernet/sfc/mcdi.h +++ b/trunk/drivers/net/ethernet/sfc/mcdi.h @@ -113,11 +113,13 @@ extern void efx_mcdi_sensor_event(struct efx_nic *efx, efx_qword_t *ev); #define MCDI_EVENT_FIELD(_ev, _field) \ EFX_QWORD_FIELD(_ev, MCDI_EVENT_ ## _field) #define MCDI_ARRAY_FIELD(_buf, _field1, _type, _index, _field2) \ - EFX_DWORD_FIELD( \ + EFX_EXTRACT_DWORD( \ *((efx_dword_t *) \ (MCDI_ARRAY_PTR(_buf, _field1, _type, _index) + \ (MC_CMD_ ## _type ## _TYPEDEF_ ## _field2 ## _OFST & ~3))), \ - MC_CMD_ ## _type ## _TYPEDEF_ ## _field2) + MC_CMD_ ## _type ## _TYPEDEF_ ## _field2 ## _LBN & 0x1f, \ + (MC_CMD_ ## _type ## _TYPEDEF_ ## _field2 ## _LBN & 0x1f) + \ + MC_CMD_ ## _type ## _TYPEDEF_ ## _field2 ## _WIDTH - 1) extern void efx_mcdi_print_fwver(struct efx_nic *efx, char *buf, size_t len); extern int efx_mcdi_drv_attach(struct efx_nic *efx, bool driver_operating,