D26366.diff
No OneTemporary
Actions

Size

674 B

Referenced Files

None

Subscribers

None

D26366.diff
View Options

	Index: sys/net/if_lagg.c
	===================================================================
	--- sys/net/if_lagg.c
	+++ sys/net/if_lagg.c
	@@ -74,6 +74,14 @@
	#include <net/if_lagg.h>
	#include <net/ieee8023ad_lacp.h>

	+#ifdef DEV_NETMAP
	+#include <net/netmap.h>
	+#include <machine/bus.h>
	+#include <dev/netmap/netmap_kern.h>
	+
	+MODULE_DEPEND(lagg, netmap, 1, 1, 1);
	+#endif
	+
	#ifdef INET6
	/*
	* XXX: declare here to avoid to include many inet6 related files..
	@@ -1793,6 +1801,13 @@
	m_freem(m);
	m = NULL;
	}
	+
	+#ifdef DEV_NETMAP
	+ if (m != NULL && nm_netmap_on(NA(scifp))) {
	+ scifp->if_input(scifp, m);
	+ m = NULL;
	+ }
	+#endif

	LAGG_RUNLOCK();
	return (m);