D6915.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D6915.id.diff
View Options

	Index: head/sys/dev/hyperv/vmbus/hv_channel.c
	===================================================================
	--- head/sys/dev/hyperv/vmbus/hv_channel.c
	+++ head/sys/dev/hyperv/vmbus/hv_channel.c
	@@ -58,14 +58,14 @@
	static void
	vmbus_channel_set_event(hv_vmbus_channel *channel)
	{
	+ struct vmbus_softc *sc = channel->vmbus_sc;
	+ uint32_t chanid = channel->offer_msg.child_rel_id;
	+
	+ atomic_set_long(&sc->vmbus_tx_evtflags[chanid >> VMBUS_EVTFLAG_SHIFT],
	+ 1UL << (chanid & VMBUS_EVTFLAG_MASK));
	+
	if (channel->offer_msg.monitor_allocated) {
	- struct vmbus_softc *sc = channel->vmbus_sc;
	hv_vmbus_monitor_page *monitor_page;
	- uint32_t chanid = channel->offer_msg.child_rel_id;
	-
	- atomic_set_long(
	- &sc->vmbus_tx_evtflags[chanid >> VMBUS_EVTFLAG_SHIFT],
	- 1UL << (chanid & VMBUS_EVTFLAG_MASK));

	monitor_page = sc->vmbus_mnf2;
	synch_set_bit(channel->monitor_bit,
	Index: head/sys/dev/hyperv/vmbus/hv_connection.c
	===================================================================
	--- head/sys/dev/hyperv/vmbus/hv_connection.c
	+++ head/sys/dev/hyperv/vmbus/hv_connection.c
	@@ -164,15 +164,8 @@
	int
	hv_vmbus_set_event(hv_vmbus_channel *channel)
	{
	- struct vmbus_softc *sc = channel->vmbus_sc;
	- int ret = 0;
	- uint32_t chanid = channel->offer_msg.child_rel_id;
	-
	- atomic_set_long(&sc->vmbus_tx_evtflags[chanid >> VMBUS_EVTFLAG_SHIFT],
	- 1UL << (chanid & VMBUS_EVTFLAG_MASK));
	- ret = hv_vmbus_signal_event(channel->signal_event_param);

	- return (ret);
	+ return hv_vmbus_signal_event(channel->signal_event_param);
	}

	void