From 785c7ee6a8cbf1f50cbafc17c8ccf61637b21e44 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@lastsummer.de>
Date: Fri, 3 Jan 2014 01:38:38 +0100
Subject: [PATCH] netmap: reduce upstream diff output; bring back __FBSDIDs

---
 sys/net/netmap/netmap.c         |  4 ++++
 sys/net/netmap/netmap_freebsd.c |  1 +
 sys/net/netmap/netmap_generic.c |  3 +++
 sys/net/netmap/netmap_kern.h    |  1 +
 sys/net/netmap/netmap_mem2.c    | 12 ++++++------
 sys/net/netmap/netmap_vale.c    |  3 ++-
 6 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/sys/net/netmap/netmap.c b/sys/net/netmap/netmap.c
index dc05b9e1dd..2b701e2143 100644
--- a/sys/net/netmap/netmap.c
+++ b/sys/net/netmap/netmap.c
@@ -128,6 +128,9 @@ ports attached to the switch)
  * is present in netmap_kern.h
  */
 
+#include <sys/cdefs.h> /* prerequisite */
+__FBSDID("$FreeBSD: head/sys/dev/netmap/netmap.c 257176 2013-10-26 17:58:36Z glebius $");
+
 #include <sys/types.h>
 #include <sys/errno.h>
 #include <sys/param.h>	/* defines used in kernel.h */
@@ -161,6 +164,7 @@ extern struct dev_ops netmap_cdevsw;
 #include <net/netmap/netmap_kern.h>
 #include <net/netmap/netmap_mem2.h>
 
+
 MALLOC_DEFINE(M_NETMAP, "netmap", "Network memory map");
 
 /*
diff --git a/sys/net/netmap/netmap_freebsd.c b/sys/net/netmap/netmap_freebsd.c
index 14b39b1bae..cff0d9ec8c 100644
--- a/sys/net/netmap/netmap_freebsd.c
+++ b/sys/net/netmap/netmap_freebsd.c
@@ -29,6 +29,7 @@
 #include <sys/param.h>  /* defines used in kernel.h */
 #include <sys/kernel.h> /* types used in module initialization */
 #include <sys/conf.h>	/* DEV_MODULE */
+
 #include <sys/devfs.h>
 
 #include <vm/vm.h>      /* vtophys */
diff --git a/sys/net/netmap/netmap_generic.c b/sys/net/netmap/netmap_generic.c
index 686fec7644..d09cbb0955 100644
--- a/sys/net/netmap/netmap_generic.c
+++ b/sys/net/netmap/netmap_generic.c
@@ -61,6 +61,9 @@
  */
 
 
+#include <sys/cdefs.h> /* prerequisite */
+__FBSDID("$FreeBSD: head/sys/dev/netmap/netmap.c 257666 2013-11-05 01:06:22Z luigi $");
+
 #include <sys/types.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
diff --git a/sys/net/netmap/netmap_kern.h b/sys/net/netmap/netmap_kern.h
index 398218cf4a..3959d1c3dc 100644
--- a/sys/net/netmap/netmap_kern.h
+++ b/sys/net/netmap/netmap_kern.h
@@ -303,6 +303,7 @@ struct netmap_adapter {
 	void *tailroom;		       /* space below the rings array */
 				       /* (used for leases) */
 
+
 	NM_SELINFO_T tx_si, rx_si;	/* global wait queues */
 
 	/* copy of if_qflush and if_transmit pointers, to intercept
diff --git a/sys/net/netmap/netmap_mem2.c b/sys/net/netmap/netmap_mem2.c
index 7823363a3c..fbafed5c46 100644
--- a/sys/net/netmap/netmap_mem2.c
+++ b/sys/net/netmap/netmap_mem2.c
@@ -23,21 +23,21 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h> /* prerequisite */
+__FBSDID("$FreeBSD: head/sys/dev/netmap/netmap.c 241723 2012-10-19 09:41:45Z glebius $");
 
 #include <sys/types.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
-#include <sys/socket.h> /* sockaddrs */
-#include <sys/sysctl.h>
-#include <sys/bus.h>	/* bus_dmamap_* */
-
 #include <vm/vm.h>	/* vtophys */
 #include <vm/pmap.h>	/* vtophys */
-
+#include <sys/socket.h> /* sockaddrs */
+#include <sys/sysctl.h>
 #include <net/if.h>
 #include <net/if_var.h>
-#include <net/netmap.h>
+#include <sys/bus.h>	/* bus_dmamap_* */
 
+#include <net/netmap.h>
 #include <net/netmap/netmap_kern.h>
 #include <net/netmap/netmap_mem2.h>
 
diff --git a/sys/net/netmap/netmap_vale.c b/sys/net/netmap/netmap_vale.c
index 08911dd7a5..ecfb70854d 100644
--- a/sys/net/netmap/netmap_vale.c
+++ b/sys/net/netmap/netmap_vale.c
@@ -55,6 +55,8 @@ ports attached to the switch)
  * is present in netmap_kern.h
  */
 
+#include <sys/cdefs.h> /* prerequisite */
+__FBSDID("$FreeBSD: head/sys/dev/netmap/netmap.c 257176 2013-10-26 17:58:36Z glebius $");
 
 #include <sys/types.h>
 #include <sys/errno.h>
@@ -92,7 +94,6 @@ ports attached to the switch)
  */
 
 #include <net/netmap.h>
-
 #include <net/netmap/netmap_kern.h>
 #include <net/netmap/netmap_mem2.h>
 
-- 
2.41.0