svn commit: r267283 - head/sys/dev/netmap

[Luigi Rizzo]

Author: luigi
Date: Mon Jun  9 15:44:31 2014
New Revision: 267283
URL: http://svnweb.freebsd.org/changeset/base/267283

Log:
  sync the code with the one in stable/10
  (wrap the if_t compatibilty function into a __FreeBSD_version
  conditional block)

Modified:
  head/sys/dev/netmap/netmap_kern.h

Modified: head/sys/dev/netmap/netmap_kern.h
==============================================================================
--- head/sys/dev/netmap/netmap_kern.h	Mon Jun  9 15:24:45 2014	(r267282)
+++ head/sys/dev/netmap/netmap_kern.h	Mon Jun  9 15:44:31 2014	(r267283)
@@ -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_gener
 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