D17987.1794797166.diff
No OneTemporary
Actions

Authored By

Unknown

Size

958 B

Referenced Files

None

Subscribers

None

D17987.1794797166.diff
View Options

	Index: sys/dev/cxgbe/t4_main.c
	===================================================================
	--- sys/dev/cxgbe/t4_main.c
	+++ sys/dev/cxgbe/t4_main.c
	@@ -1560,10 +1560,6 @@
	if (vi->nofldrxq != 0)
	ifp->if_capabilities \|= IFCAP_TOE;
	#endif
	-#ifdef DEV_NETMAP
	- if (vi->nnmrxq != 0)
	- ifp->if_capabilities \|= IFCAP_NETMAP;
	-#endif
	#ifdef RATELIMIT
	if (is_ethoffload(vi->pi->adapter) && vi->nofldtxq != 0) {
	ifp->if_capabilities \|= IFCAP_TXRTLMT;
	@@ -1583,7 +1579,7 @@

	ether_ifattach(ifp, vi->hw_addr);
	#ifdef DEV_NETMAP
	- if (ifp->if_capabilities & IFCAP_NETMAP)
	+ if (vi->nnmrxq != 0)
	cxgbe_nm_attach(vi);
	#endif
	sb = sbuf_new_auto();
	Index: sys/dev/netmap/netmap_freebsd.c
	===================================================================
	--- sys/dev/netmap/netmap_freebsd.c
	+++ sys/dev/netmap/netmap_freebsd.c
	@@ -1549,6 +1549,7 @@
	void
	nm_os_onattach(struct ifnet *ifp)
	{
	+ ifp->if_capabilities \|= IFCAP_NETMAP;
	}

	void