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

sync the code with the one in stable/10

Browse Source 
(wrap the if_t compatibilty function into a __FreeBSD_version
conditional block)
This commit is contained in:
Luigi Rizzo 2014-06-09 15:44:31 +00:00
parent 82dcc80db1
commit 46aa1303f3
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/netmap/netmap_kern.h
View File

@ -62,6 +62,9 @@
#define NM_ATOMIC_TEST_AND_SET(p) (!atomic_cmpset_acq_int((p), 0, 1))
#define NM_ATOMIC_CLEAR(p) atomic_store_rel_int((p), 0)
#if __FreeBSD_version >= 1100005
struct netmap_adapter *netmap_getna(if_t ifp);
#endif
MALLOC_DECLARE(M_NETMAP);
@ -1261,7 +1264,6 @@ void netmap_catch_tx(struct netmap_generic_adapter *na, int enable);
int generic_xmit_frame(struct ifnet *ifp, struct mbuf *m, void *addr, u_int len, u_int ring_nr);
int generic_find_num_desc(struct ifnet *ifp, u_int *tx, u_int *rx);
void generic_find_num_queues(struct ifnet *ifp, u_int *txq, u_int *rxq);
struct netmap_adapter *netmap_getna(if_t ifp);
/*
* netmap_mitigation API. This is used by the generic adapter