diff --git a/CREDITS b/CREDITS
index 3d83930..b20c112 100644
--- a/CREDITS
+++ b/CREDITS
@@ -44,6 +44,7 @@ Additional people who have contributed patches:
 	Greg Troxel			<gdt at ir dot bbn dot com>
 	Gregor Maier			<gregor at net dot in dot tum dot de>
 	Guillaume Pelat			<endymion_ at users dot sourceforge dot net>
+	Hagen Paul Pfeifer		<hagen at jauu dot net>
 	Hyung Sik Yoon			<hsyn at kr dot ibm dot com>
 	Igor Khristophorov		<igor at atdot dot org>
 	Jan-Philip Velders		<jpv at veldersjes dot net>
diff --git a/pcap-linux.c b/pcap-linux.c
index 1bbbc98..4509443 100644
--- a/pcap-linux.c
+++ b/pcap-linux.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/pcap-linux.c,v 1.137 2008-02-02 22:25:51 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-linux.c,v 1.138 2008-02-08 01:34:49 guy Exp $ (LBL)";
 #endif
 
 /*
@@ -1750,14 +1750,14 @@ pcap_close_linux_mmap( pcap_t *handle )
 }
 
 
-int
+static int
 pcap_getnonblock_mmap(pcap_t *p, char *errbuf)
 {
 	/* use negative value of timeout to indicate non blocking ops */
 	return (p->md.timeout<0);
 }
 
-int
+static int
 pcap_setnonblock_mmap(pcap_t *p, int nonblock, char *errbuf)
 {
 	/* map each value to the corresponding 2's complement, to