D7950.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D7950.id.diff
View Options

	Index: head/sys/dev/hyperv/netvsc/hv_net_vsc.c
	===================================================================
	--- head/sys/dev/hyperv/netvsc/hv_net_vsc.c
	+++ head/sys/dev/hyperv/netvsc/hv_net_vsc.c
	@@ -444,8 +444,15 @@
	vmbus_xact_put(xact);

	if (status != HN_NVS_STATUS_OK) {
	- if_printf(sc->hn_ifp, "nvs init failed for ver 0x%x\n",
	- nvs_ver);
	+ if (bootverbose) {
	+ /*
	+ * Caller may try another NVS version, and will log
	+ * error if there are no more NVS versions to try,
	+ * so don't bark out loud here.
	+ */
	+ if_printf(sc->hn_ifp, "nvs init failed for ver 0x%x\n",
	+ nvs_ver);
	+ }
	return (EINVAL);
	}
	return (0);
	@@ -499,7 +506,7 @@
	static int
	hn_nvs_init(struct hn_softc *sc)
	{
	- int i;
	+ int i, error;

	if (device_is_attached(sc->hn_dev)) {
	/*
	@@ -511,15 +518,19 @@
	HN_NDIS_VERSION_MAJOR(sc->hn_ndis_ver),
	HN_NDIS_VERSION_MINOR(sc->hn_ndis_ver));
	}
	- return (hn_nvs_doinit(sc, sc->hn_nvs_ver));
	+
	+ error = hn_nvs_doinit(sc, sc->hn_nvs_ver);
	+ if (error) {
	+ if_printf(sc->hn_ifp, "reinit NVS version 0x%x "
	+ "failed: %d\n", sc->hn_nvs_ver, error);
	+ }
	+ return (error);
	}

	/*
	* Find the supported NVS version and set NDIS version accordingly.
	*/
	for (i = 0; i < nitems(hn_nvs_version); ++i) {
	- int error;
	-
	error = hn_nvs_doinit(sc, hn_nvs_version[i]);
	if (!error) {
	sc->hn_nvs_ver = hn_nvs_version[i];