PERFORCE change 180983 for review

[Alexandre Fiveg]

http://p4web.freebsd.org/@@180983?ac=10

Change 180983 by afiveg at cottonmouth on 2010/07/15 09:39:05

	cosmetic fixes 

Affected files ...

.. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-bpf.c#11 edit
.. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-int.h#11 edit
.. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap.c#13 edit
.. //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#18 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#26 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#25 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#23 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_e1000.h#15 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#29 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#29 edit
.. //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#13 edit
.. //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#14 edit
.. //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#9 edit
.. //depot/projects/soc2010/ringmap/tests/libpcap/easy_pcap.c#8 edit

Differences ...

==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-bpf.c#11 (text+ko) ====

@@ -216,9 +216,6 @@
 static void
 pcap_cleanup_zbuf(pcap_t *p)
 {
-#ifdef RINGMAP
-	RINGMAP_FUNC_DEBUG(start);
-#endif
 	/*
 	 * Delete the mappings.  Note that p->buffer gets initialized to one
 	 * of the mmapped regions in this case, so do not try and free it

==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-int.h#11 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap.c#13 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#18 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#26 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#25 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#23 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_e1000.h#15 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#29 (text+ko) ====

@@ -46,16 +46,15 @@
 d_close_t	ringmap_close;
 d_ioctl_t	ringmap_ioctl;
 d_read_t	ringmap_read;
+d_mmap_single_t ringmap_mmap;
 
-/*
- *	Character Device for access on if_em driver structures
- */
 static struct cdevsw ringmap_devsw = {
 	.d_version 	= D_VERSION,
 	.d_open 	= ringmap_open,
 	.d_close 	= ringmap_close,
 	.d_ioctl	= ringmap_ioctl,
 	.d_read		= ringmap_read,
+	.d_mmap_single = ringmap_mmap,
 	.d_name 	= "ringmap_cdev"
 };
 
@@ -269,6 +268,16 @@
     return (0);
 }
 
+
+int 
+ringmap_mmap(struct cdev *cdev, vm_ooffset_t *offset,
+    vm_size_t size, struct vm_object **object, int nprot)
+{
+
+	return (0);
+}
+
+
 int 
 ringmap_read(struct cdev *cdev, struct uio *uio, int ioflag)
 {

==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#29 (text+ko) ====


==== //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#13 (text+ko) ====


==== //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#14 (text+ko) ====


==== //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#9 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/libpcap/easy_pcap.c#8 (text+ko) ====