d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cxgbe: revert r309725

Browse Source 
After the fix contained in r341144, cxgbe does not need anymore
to set the IFCAP_NETMAP flag manually.

Reviewed by:	np
Approved by:	gnn (mentor)
MFC after:	3 days
Differential Revision:	https://reviews.freebsd.org/D17987
This commit is contained in:
Vincenzo Maffione 2018-11-28 15:29:58 +00:00
parent d55913f555
commit 43cf589ced
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=341145
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/cxgbe/t4_main.c
View File

@ -1633,10 +1633,6 @@ cxgbe_vi_attach(device_t dev, struct vi_info *vi)
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;
@ -1656,7 +1652,7 @@ cxgbe_vi_attach(device_t dev, struct vi_info *vi)
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();

2
sys/dev/cxgbe/t4_netmap.c
View File

@ -982,7 +982,7 @@ cxgbe_nm_attach(struct vi_info *vi)
na.nm_register = cxgbe_netmap_reg;
na.num_tx_rings = vi->nnmtxq;
na.num_rx_rings = vi->nnmrxq;
netmap_attach(&na);
netmap_attach(&na); /* This adds IFCAP_NETMAP to if_capabilities */
}
void