Commit 42e6cae1 authored May 12, 2017 by Bert Kenward Committed by David S. Miller May 12, 2017

sfc: revert changes to NIC revision numbers

The revision enum values (eg EFX_REV_HUNT_A0) form part of our API,
and are included in ethtool. If these are inconsistent then ethtool
will print garbage for a register dump (ethtool -d).

Fixes: 5a6681e2 ("sfc: separate out SFC4000 ("Falcon") support into new sfc-falcon driver")
Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent b12ca80c

drivers/net/ethernet/sfc/nic.h

+6 −2

Original line number	Diff line number	Diff line
		@@ -18,8 +18,12 @@
		#include "mcdi.h"

		enum {
		EFX_REV_SIENA_A0 = 0,
		EFX_REV_HUNT_A0 = 1,
		/* Revisions 0-2 were Falcon A0, A1 and B0 respectively.
		* They are not supported by this driver but these revision numbers
		* form part of the ethtool API for register dumping.
		*/
		EFX_REV_SIENA_A0 = 3,
		EFX_REV_HUNT_A0 = 4,
		};

		static inline int efx_nic_rev(struct efx_nic *efx)