svn commit: r184013 - in projects/releng_6_xen/sys: . dev/usb netinet/libalias

[Kip Macy]

Author: kmacy
Date: Sat Oct 18 05:42:58 2008
New Revision: 184013
URL: http://svn.freebsd.org/changeset/base/184013

Log:
  integrate through r184012
  
  IF_RELENG_6

Modified:
  projects/releng_6_xen/sys/   (props changed)
  projects/releng_6_xen/sys/dev/usb/umass.c
  projects/releng_6_xen/sys/dev/usb/usbdevs
  projects/releng_6_xen/sys/netinet/libalias/alias_db.c

Modified: projects/releng_6_xen/sys/dev/usb/umass.c
==============================================================================
--- projects/releng_6_xen/sys/dev/usb/umass.c	Sat Oct 18 04:28:21 2008	(r184012)
+++ projects/releng_6_xen/sys/dev/usb/umass.c	Sat Oct 18 05:42:58 2008	(r184013)
@@ -424,6 +424,10 @@ Static struct umass_devdescr_t umass_dev
 	  UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
 	  FORCE_SHORT_INQUIRY
 	},
+	{ USB_VENDOR_NIKON, USB_PRODUCT_NIKON_D300, RID_WILDCARD,
+	  UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
+	  NO_QUIRKS
+	},
 	{ USB_VENDOR_OLYMPUS, USB_PRODUCT_OLYMPUS_C1, RID_WILDCARD,
 	  UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
 	  WRONG_CSWSIG

Modified: projects/releng_6_xen/sys/dev/usb/usbdevs
==============================================================================
--- projects/releng_6_xen/sys/dev/usb/usbdevs	Sat Oct 18 04:28:21 2008	(r184012)
+++ projects/releng_6_xen/sys/dev/usb/usbdevs	Sat Oct 18 05:42:58 2008	(r184013)
@@ -1356,6 +1356,7 @@ product NETGEAR FA120		0x1040	USB 2.0 Et
 /* Nikon products */
 product NIKON E990		0x0102	Digital Camera E990
 product NIKON LS40		0x4000	CoolScan LS40 ED
+product NIKON D300		0x041a  Digital Camera D300
 
 /* NovaTech Products */
 product NOVATECH NV902		0x9020  NovaTech NV-902W

Modified: projects/releng_6_xen/sys/netinet/libalias/alias_db.c
==============================================================================
--- projects/releng_6_xen/sys/netinet/libalias/alias_db.c	Sat Oct 18 04:28:21 2008	(r184012)
+++ projects/releng_6_xen/sys/netinet/libalias/alias_db.c	Sat Oct 18 05:42:58 2008	(r184013)
@@ -603,7 +603,7 @@ GetNewPort(struct libalias *la, struct a
 			port_sys = ntohs(port_net);
 		} else {
 			/* First trial and all subsequent are random. */
-			port_sys = random() & ALIAS_PORT_MASK;
+			port_sys = arc4random() & ALIAS_PORT_MASK;
 			port_sys += ALIAS_PORT_BASE;
 			port_net = htons(port_sys);
 		}
@@ -654,7 +654,7 @@ GetNewPort(struct libalias *la, struct a
 			}
 #endif
 		}
-		port_sys = random() & ALIAS_PORT_MASK;
+		port_sys = arc4random() & ALIAS_PORT_MASK;
 		port_sys += ALIAS_PORT_BASE;
 		port_net = htons(port_sys);
 	}
@@ -767,9 +767,9 @@ FindNewPortGroup(struct libalias *la,
 
 		/* First trial and all subsequent are random. */
 		if (align == FIND_EVEN_ALIAS_BASE)
-			port_sys = random() & ALIAS_PORT_MASK_EVEN;
+			port_sys = arc4random() & ALIAS_PORT_MASK_EVEN;
 		else
-			port_sys = random() & ALIAS_PORT_MASK;
+			port_sys = arc4random() & ALIAS_PORT_MASK;
 
 		port_sys += ALIAS_PORT_BASE;
 	}
@@ -791,9 +791,9 @@ FindNewPortGroup(struct libalias *la,
 
 		/* Find a new base to try */
 		if (align == FIND_EVEN_ALIAS_BASE)
-			port_sys = random() & ALIAS_PORT_MASK_EVEN;
+			port_sys = arc4random() & ALIAS_PORT_MASK_EVEN;
 		else
-			port_sys = random() & ALIAS_PORT_MASK;
+			port_sys = arc4random() & ALIAS_PORT_MASK;
 
 		port_sys += ALIAS_PORT_BASE;
 	}