D7866.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D7866.diff
View Options

	Index: head/sys/dev/hyperv/netvsc/hv_net_vsc.h
	===================================================================
	--- head/sys/dev/hyperv/netvsc/hv_net_vsc.h
	+++ head/sys/dev/hyperv/netvsc/hv_net_vsc.h
	@@ -202,7 +202,6 @@
	struct ifnet *hn_ifp;
	struct ifmedia hn_media;
	device_t hn_dev;
	- uint8_t hn_unit;
	int hn_carrier;
	int hn_if_flags;
	struct mtx hn_lock;
	Index: head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
	===================================================================
	--- head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
	+++ head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
	@@ -455,7 +455,6 @@
	uint8_t eaddr[ETHER_ADDR_LEN];
	uint32_t link_status;
	hn_softc_t *sc;
	- int unit = device_get_unit(dev);
	struct ifnet *ifp = NULL;
	int error, ring_cnt, tx_ring_cnt;
	#if __FreeBSD_version >= 1100045
	@@ -464,7 +463,6 @@

	sc = device_get_softc(dev);

	- sc->hn_unit = unit;
	sc->hn_dev = dev;
	sc->hn_prichan = vmbus_get_channel(dev);

	@@ -1855,11 +1853,9 @@
	static void
	hn_watchdog(struct ifnet *ifp)
	{
	- hn_softc_t *sc;
	- sc = ifp->if_softc;

	- printf("hn%d: watchdog timeout -- resetting\n", sc->hn_unit);
	- hn_ifinit(sc); /???/
	+ if_printf(ifp, "watchdog timeout -- resetting\n");
	+ hn_ifinit(ifp->if_softc); /* XXX */
	if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
	}
	#endif