This needs to be done before we separate MCDI from siena_nic_data.
Signed-off-by: NBen Hutchings <bhutchings@solarflare.com>