From owner-svn-src-head@FreeBSD.ORG  Mon Jun  9 15:44:31 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A10DC6EC;
 Mon,  9 Jun 2014 15:44:31 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8E4DA244C;
 Mon,  9 Jun 2014 15:44:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s59FiVQZ078513;
 Mon, 9 Jun 2014 15:44:31 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s59FiV6W078512;
 Mon, 9 Jun 2014 15:44:31 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201406091544.s59FiV6W078512@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Mon, 9 Jun 2014 15:44:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r267283 - head/sys/dev/netmap
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Jun 2014 15:44:31 -0000

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