D44591.id136457.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D44591.id136457.diff
View Options

	diff --git a/sys/compat/linuxkpi/common/include/linux/netdevice.h b/sys/compat/linuxkpi/common/include/linux/netdevice.h
	--- a/sys/compat/linuxkpi/common/include/linux/netdevice.h
	+++ b/sys/compat/linuxkpi/common/include/linux/netdevice.h
	@@ -230,7 +230,7 @@
	void linuxkpi_netif_napi_del(struct napi_struct *);
	bool linuxkpi_napi_schedule_prep(struct napi_struct *);
	void linuxkpi___napi_schedule(struct napi_struct *);
	-void linuxkpi_napi_schedule(struct napi_struct *);
	+bool linuxkpi_napi_schedule(struct napi_struct *);
	void linuxkpi_napi_reschedule(struct napi_struct *);
	bool linuxkpi_napi_complete_done(struct napi_struct *, int);
	bool linuxkpi_napi_complete(struct napi_struct *);
	@@ -272,6 +272,13 @@
	netif_napi_add(dev, napi, napi_poll);
	}

	+static inline bool
	+napi_is_scheduled(struct napi_struct *napi)
	+{
	+
	+ return (test_bit(LKPI_NAPI_FLAG_IS_SCHEDULED, &napi->state));
	+}
	+
	/* -------------------------------------------------------------------------- */

	static inline void
	diff --git a/sys/compat/linuxkpi/common/src/linux_netdev.c b/sys/compat/linuxkpi/common/src/linux_netdev.c
	--- a/sys/compat/linuxkpi/common/src/linux_netdev.c
	+++ b/sys/compat/linuxkpi/common/src/linux_netdev.c
	@@ -184,7 +184,7 @@
	}
	}

	-void
	+bool
	linuxkpi_napi_schedule(struct napi_struct *napi)
	{

	@@ -194,8 +194,12 @@
	* iwlwifi calls this sequence instead of napi_schedule()
	* to be able to test the prep result.
	*/
	- if (napi_schedule_prep(napi))
	+ if (napi_schedule_prep(napi)) {
	__napi_schedule(napi);
	+ return (true);
	+ }
	+
	+ return (false);
	}

	void