Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/dev/pci/if_sip.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/pci/if_sip.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.150
retrieving revision 1.150.2.1
diff -u -p -r1.150 -r1.150.2.1
--- src/sys/dev/pci/if_sip.c	2011/10/15 19:50:20	1.150
+++ src/sys/dev/pci/if_sip.c	2012/04/17 00:07:48	1.150.2.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_sip.c,v 1.150 2011/10/15 19:50:20 dholland Exp $	*/
+/*	$NetBSD: if_sip.c,v 1.150.2.1 2012/04/17 00:07:48 yamt Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -73,9 +73,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.150 2011/10/15 19:50:20 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.150.2.1 2012/04/17 00:07:48 yamt Exp $");
+
 
-#include "rnd.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -89,9 +89,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1
 #include <sys/device.h>
 #include <sys/queue.h>
 
-#if NRND > 0
 #include <sys/rnd.h>
-#endif
 
 #include <net/if.h>
 #include <net/if_dl.h>
@@ -354,9 +352,7 @@ struct sip_softc {
 
 	void (*sc_rxintr)(struct sip_softc *);
 
-#if NRND > 0
-	rndsource_element_t rnd_source;	/* random source */
-#endif
+	krndsource_t rnd_source;	/* random source */
 };
 
 #define	sc_bits	sc_parm->p_bits
@@ -911,9 +907,7 @@ sipcom_do_detach(device_t self, enum sip
 		}
 #endif /* SIP_EVENT_COUNTERS */
 
-#if NRND > 0
 		rnd_detach_source(&sc->rnd_source);
-#endif
 
 		ether_ifdetach(ifp);
 		if_detach(ifp);
@@ -1133,7 +1127,7 @@ sipcom_attach(device_t parent, device_t 
 
 	if ((error = bus_dmamem_map(sc->sc_dmat, &sc->sc_seg, rseg,
 	    sizeof(struct sip_control_data), (void **)&sc->sc_control_data,
-	    BUS_DMA_COHERENT|BUS_DMA_NOCACHE)) != 0) {
+	    BUS_DMA_COHERENT)) != 0) {
 		aprint_error_dev(sc->sc_dev, "unable to map control data, error = %d\n",
 		    error);
 		sipcom_do_detach(self, SIP_ATTACH_ALLOC_MEM);
@@ -1291,10 +1285,8 @@ sipcom_attach(device_t parent, device_t 
 	sc->sc_prev.ec_capenable = sc->sc_ethercom.ec_capenable;
 	sc->sc_prev.is_vlan = VLAN_ATTACHED(&(sc)->sc_ethercom);
 	sc->sc_prev.if_capenable = ifp->if_capenable;
-#if NRND > 0
 	rnd_attach_source(&sc->rnd_source, device_xname(sc->sc_dev),
 	    RND_TYPE_NET, 0);
-#endif
 
 	/*
 	 * The number of bytes that must be available in
@@ -1842,10 +1834,7 @@ sipcom_intr(void *arg)
 		if ((isr & sc->sc_imr) == 0)
 			break;
 
-#if NRND > 0
-		if (RND_ENABLED(&sc->rnd_source))
-			rnd_add_uint32(&sc->rnd_source, isr);
-#endif
+		rnd_add_uint32(&sc->rnd_source, isr);
 
 		handled = 1;