D8974.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D8974.diff
View Options

	Index: head/sys/dev/sfxge/sfxge.c
	===================================================================
	--- head/sys/dev/sfxge/sfxge.c
	+++ head/sys/dev/sfxge/sfxge.c
	@@ -737,6 +737,16 @@
	goto fail3;
	sc->enp = enp;

	+ /* Initialize MCDI to talk to the microcontroller. */
	+ DBGPRINT(sc->dev, "mcdi_init...");
	+ if ((error = sfxge_mcdi_init(sc)) != 0)
	+ goto fail4;
	+
	+ /* Probe the NIC and build the configuration data area. */
	+ DBGPRINT(sc->dev, "nic_probe...");
	+ if ((error = efx_nic_probe(enp)) != 0)
	+ goto fail5;
	+
	if (!ISP2(sfxge_rx_ring_entries) \|\|
	(sfxge_rx_ring_entries < EFX_RXQ_MINNDESCS) \|\|
	(sfxge_rx_ring_entries > EFX_RXQ_MAXNDESCS)) {
	@@ -759,16 +769,6 @@
	}
	sc->txq_entries = sfxge_tx_ring_entries;

	- /* Initialize MCDI to talk to the microcontroller. */
	- DBGPRINT(sc->dev, "mcdi_init...");
	- if ((error = sfxge_mcdi_init(sc)) != 0)
	- goto fail4;
	-
	- /* Probe the NIC and build the configuration data area. */
	- DBGPRINT(sc->dev, "nic_probe...");
	- if ((error = efx_nic_probe(enp)) != 0)
	- goto fail5;
	-
	SYSCTL_ADD_STRING(device_get_sysctl_ctx(dev),
	SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
	OID_AUTO, "version", CTLFLAG_RD,
	@@ -861,14 +861,14 @@
	efx_nvram_fini(enp);

	fail6:
	+fail_tx_ring_entries:
	+fail_rx_ring_entries:
	efx_nic_unprobe(enp);

	fail5:
	sfxge_mcdi_fini(sc);

	fail4:
	-fail_tx_ring_entries:
	-fail_rx_ring_entries:
	sc->enp = NULL;
	efx_nic_destroy(enp);
	SFXGE_EFSYS_LOCK_DESTROY(&sc->enp_lock);