date:20140730

CVS commit: src/sys/netinet

2014-07-30 Thread Tyler R. Retzlaff

Module Name:src
Committed By:   rtr
Date:   Wed Jul 30 06:53:53 UTC 2014

Modified Files:
src/sys/netinet: tcp_usrreq.c

Log Message:
put boilerplate extraction of inpcb or in6pcb and tcpcb performed in tcp
usrreqs into a function that can be called instead of cut  pasting it
to every single usrreq function.

tcp_getpcb(struct socket *, struct inpcb **, struct in6pcb **, struct tcpcb **)

  * examines the family of the provided socket and fills in either inpcb
or in6pcb and tcpcb.
  * if the pcb is not present for the family of the socket EINVAL is
returned, if the family is not AF_INET{,6} EAFNOSUPPORT is returned.

signature provided by and patch reviewed by rmind


To generate a diff of this commit:
cvs rdiff -u -r1.191 -r1.192 src/sys/netinet/tcp_usrreq.c

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

Modified files:

Index: src/sys/netinet/tcp_usrreq.c
diff -u src/sys/netinet/tcp_usrreq.c:1.191 src/sys/netinet/tcp_usrreq.c:1.192
--- src/sys/netinet/tcp_usrreq.c:1.191	Thu Jul 24 16:02:19 2014
+++ src/sys/netinet/tcp_usrreq.c	Wed Jul 30 06:53:53 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: tcp_usrreq.c,v 1.191 2014/07/24 16:02:19 rtr Exp $	*/
+/*	$NetBSD: tcp_usrreq.c,v 1.192 2014/07/30 06:53:53 rtr Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -99,7 +99,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tcp_usrreq.c,v 1.191 2014/07/24 16:02:19 rtr Exp $);
+__KERNEL_RCSID(0, $NetBSD: tcp_usrreq.c,v 1.192 2014/07/30 06:53:53 rtr Exp $);
 
 #include opt_inet.h
 #include opt_ipsec.h
@@ -177,6 +177,41 @@ tcp_debug_trace(struct socket *so, struc
 #endif
 }
 
+static int
+tcp_getpcb(struct socket *so, struct inpcb **inp,
+struct in6pcb **in6p, struct tcpcb **tp)
+{
+	/*
+	 * When a TCP is attached to a socket, then there will be
+	 * a (struct inpcb) pointed at by the socket, and this
+	 * structure will point at a subsidary (struct tcpcb).
+	 */
+	switch (so-so_proto-pr_domain-dom_family) {
+#ifdef INET
+	case PF_INET:
+		*inp = sotoinpcb(so);
+		if (*inp == NULL)
+			return EINVAL;
+		*tp = intotcpcb(*inp);
+		break;
+#endif
+#ifdef INET6
+	case PF_INET6:
+		*in6p = sotoin6pcb(so);
+		if (*in6p == NULL)
+			return EINVAL;
+		*tp = in6totcpcb(*in6p);
+		break;
+#endif
+	default:
+		return EAFNOSUPPORT;
+	}
+
+	KASSERT(tp != NULL);
+
+	return 0;
+}
+
 /*
  * Process a TCP user request for TCP tb.  If this is a send request
  * then m is the mbuf chain of send data.  If this is a timer expiration
@@ -186,15 +221,12 @@ static int
 tcp_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam,
 struct mbuf *control, struct lwp *l)
 {
-	struct inpcb *inp;
-#ifdef INET6
-	struct in6pcb *in6p;
-#endif
+	struct inpcb *inp = NULL;
+	struct in6pcb *in6p = NULL;
 	struct tcpcb *tp = NULL;
 	int s;
 	int error = 0;
 	int ostate = 0;
-	int family;	/* family of the socket */
 
 	KASSERT(req != PRU_ATTACH);
 	KASSERT(req != PRU_DETACH);
@@ -208,13 +240,11 @@ tcp_usrreq(struct socket *so, int req, s
 	KASSERT(req != PRU_RCVOOB);
 	KASSERT(req != PRU_SENDOOB);
 
-	family = so-so_proto-pr_domain-dom_family;
-
 	s = splsoftnet();
 
 	if (req == PRU_PURGEIF) {
 		mutex_enter(softnet_lock);
-		switch (family) {
+		switch (so-so_proto-pr_domain-dom_family) {
 #ifdef INET
 		case PF_INET:
 			in_pcbpurgeif0(tcbtable, (struct ifnet *)control);
@@ -241,57 +271,17 @@ tcp_usrreq(struct socket *so, int req, s
 
 	KASSERT(solocked(so));
 
-	switch (family) {
-#ifdef INET
-	case PF_INET:
-		inp = sotoinpcb(so);
-#ifdef INET6
-		in6p = NULL;
-#endif
-		break;
-#endif
-#ifdef INET6
-	case PF_INET6:
-		inp = NULL;
-		in6p = sotoin6pcb(so);
-		break;
-#endif
-	default:
+	if ((error = tcp_getpcb(so, inp, in6p, tp)) != 0) {
 		splx(s);
-		return EAFNOSUPPORT;
+		return error;
 	}
+
+	ostate = tcp_debug_capture(tp, req);
+
 	KASSERT(!control || req == PRU_SEND);
 #ifdef INET6
 	/* XXX: KASSERT((inp != NULL) ^ (in6p != NULL)); */
 #endif
-	/*
-	 * When a TCP is attached to a socket, then there will be
-	 * a (struct inpcb) pointed at by the socket, and this
-	 * structure will point at a subsidary (struct tcpcb).
-	 */
-	if (inp == NULL
-#ifdef INET6
-	 in6p == NULL
-#endif
-	)
-	{
-		error = EINVAL;
-		goto release;
-	}
-#ifdef INET
-	if (inp) {
-		tp = intotcpcb(inp);
-		/* WHAT IF TP IS 0? */
-		ostate = tcp_debug_capture(tp, req);
-	}
-#endif
-#ifdef INET6
-	if (in6p) {
-		tp = in6totcpcb(in6p);
-		/* WHAT IF TP IS 0? */
-		ostate = tcp_debug_capture(tp, req);
-	}
-#endif
 
 	switch (req) {
 
@@ -435,10 +425,9 @@ tcp_usrreq(struct socket *so, int req, s
 	}
 
 	tcp_debug_trace(so, tp, ostate, req);
-
-release:
 	splx(s);
-	return (error);
+
+	return error;
 }
 
 static void
@@ -462,7 +451,6 @@ change_keepalive(struct socket *so, stru
 		TCP_TIMER_ARM(tp, TCPT_2MSL, tp-t_maxidle);
 }
 
-
 int
 tcp_ctloutput(int op, struct socket *so, struct sockopt *sopt)
 {
@@ -788,35 +776,17 @@ out:
 static

CVS commit: src/sys/arch/arm/arm

2014-07-30 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Wed Jul 30 07:11:57 UTC 2014

Modified Files:
src/sys/arch/arm/arm: cpufunc_asm_arm11x6.S

Log Message:
Trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/arm/cpufunc_asm_arm11x6.S

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

Modified files:

Index: src/sys/arch/arm/arm/cpufunc_asm_arm11x6.S
diff -u src/sys/arch/arm/arm/cpufunc_asm_arm11x6.S:1.4 src/sys/arch/arm/arm/cpufunc_asm_arm11x6.S:1.5
--- src/sys/arch/arm/arm/cpufunc_asm_arm11x6.S:1.4	Sun Mar 30 01:15:03 2014
+++ src/sys/arch/arm/arm/cpufunc_asm_arm11x6.S	Wed Jul 30 07:11:57 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpufunc_asm_arm11x6.S,v 1.4 2014/03/30 01:15:03 matt Exp $	*/
+/*	$NetBSD: cpufunc_asm_arm11x6.S,v 1.5 2014/07/30 07:11:57 skrll Exp $	*/
 
 /*
  * Copyright (c) 2007 Microsoft
@@ -63,7 +63,7 @@
 #include machine/asm.h
 #include arm/locore.h
 
-RCSID($NetBSD: cpufunc_asm_arm11x6.S,v 1.4 2014/03/30 01:15:03 matt Exp $)
+RCSID($NetBSD: cpufunc_asm_arm11x6.S,v 1.5 2014/07/30 07:11:57 skrll Exp $)
 
 #if 0
 #define Invalidate_I_cache(Rtmp1, Rtmp2) \
@@ -74,7 +74,7 @@ RCSID($NetBSD: cpufunc_asm_arm11x6.S,v 
  *
  *Erratum 411920 in ARM1136 (fixed in r1p4)
  *Erratum 415045 in ARM1176 (fixed in r0p5?)
- * 
+ *
  *	- value of arg 'reg' Should Be Zero
  */
 #define Invalidate_I_cache(Rtmp1, Rtmp2) \
@@ -143,20 +143,20 @@ ENTRY_NP(arm11x6_icache_sync_range)
 	/* Erratum ARM1176 371367 */
 	mrs	r2, cpsr		/* save the CPSR */
 	cpsid	ifa			/* disable interrupts (irq,fiq,abort) */
-	mov	r3, #0 
+	mov	r3, #0
 	mcr	p15, 0, r3, c13, c0, 0	/* write FCSE (uTLB invalidate) */
 	mcr	p15, 0, r3, c7, c5, 4	/* flush prefetch buffer */
-	add	r3, pc, #0x24 
+	add	r3, pc, #0x24
 	mcr	p15, 0, r3, c7, c13, 1	/* prefetch I-cache line */
 	mcrr	p15, 0, r1, r0, c5	/* invalidate I-cache range */
 	msr	cpsr_cx, r2		/* local_irq_restore */
-	nop 
-	nop 
-	nop 
-	nop 
-	nop 
-	nop 
-	nop 
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
 
 	mcrr	p15, 0, r1, r0, c12	/* clean and invalidate D cache range */ /* XXXNH */
 	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
@@ -170,20 +170,20 @@ ENTRY_NP(arm11x6_idcache_wbinv_range)
 	/* Erratum ARM1176 371367 */
 	mrs	r2, cpsr		/* save the CPSR */
 	cpsid	ifa			/* disable interrupts (irq,fiq,abort) */
-	mov	r3, #0 
+	mov	r3, #0
 	mcr	p15, 0, r3, c13, c0, 0	/* write FCSE (uTLB invalidate) */
 	mcr	p15, 0, r3, c7, c5, 4	/* flush prefetch buffer */
-	add	r3, pc, #0x24 
+	add	r3, pc, #0x24
 	mcr	p15, 0, r3, c7, c13, 1	/* prefetch I-cache line */
 	mcrr	p15, 0, r1, r0, c5	/* invalidate I-cache range */
 	msr	cpsr_cx, r2		/* local_irq_restore */
-	nop 
-	nop 
-	nop 
-	nop 
-	nop 
-	nop 
-	nop 
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
+	nop
 
 	mcrr	p15, 0, r1, r0, c14	/* clean and invalidate D cache range */
 	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
@@ -192,7 +192,7 @@ END(arm11x6_idcache_wbinv_range)
 
 /*
  * Preload the cache before issuing the WFI by conditionally disabling the
- * mcr intstructions the first time around the loop. Ensure the function is 
+ * mcr intstructions the first time around the loop. Ensure the function is
  * cacheline aligned.
  */
 	.arch	armv6

CVS commit: src/sys/kern

2014-07-30 Thread Ryota Ozaki

Module Name:src
Committed By:   ozaki-r
Date:   Wed Jul 30 07:44:00 UTC 2014

Modified Files:
src/sys/kern: kern_rwlock.c

Log Message:
Fix typo in comment


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/kern/kern_rwlock.c

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

Modified files:

Index: src/sys/kern/kern_rwlock.c
diff -u src/sys/kern/kern_rwlock.c:1.42 src/sys/kern/kern_rwlock.c:1.43
--- src/sys/kern/kern_rwlock.c:1.42	Sat Oct 19 21:01:39 2013
+++ src/sys/kern/kern_rwlock.c	Wed Jul 30 07:44:00 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_rwlock.c,v 1.42 2013/10/19 21:01:39 mrg Exp $	*/
+/*	$NetBSD: kern_rwlock.c,v 1.43 2014/07/30 07:44:00 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_rwlock.c,v 1.42 2013/10/19 21:01:39 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_rwlock.c,v 1.43 2014/07/30 07:44:00 ozaki-r Exp $);
 
 #define	__RWLOCK_PRIVATE
 
@@ -290,7 +290,7 @@ rw_vector_enter(krwlock_t *rw, const krw
 	/*
 	 * We play a slight trick here.  If we're a reader, we want
 	 * increment the read count.  If we're a writer, we want to
-	 * set the owner field and whe WRITE_LOCKED bit.
+	 * set the owner field and the WRITE_LOCKED bit.
 	 *
 	 * In the latter case, we expect those bits to be zero,
 	 * therefore we can use an add operation to set them, which

CVS commit: src/sys

2014-07-30 Thread Tyler R. Retzlaff

Module Name:src
Committed By:   rtr
Date:   Wed Jul 30 10:04:26 UTC 2014

Modified Files:
src/sys/dev/bluetooth: bthidev.c btmagic.c btsco.c
src/sys/kern: uipc_socket.c uipc_usrreq.c
src/sys/net: raw_usrreq.c rtsock.c
src/sys/netatalk: ddp_usrreq.c
src/sys/netbt: hci_socket.c l2cap.h l2cap_socket.c l2cap_upper.c
rfcomm.h rfcomm_socket.c rfcomm_upper.c sco.h sco_socket.c
sco_upper.c
src/sys/netinet: raw_ip.c tcp_usrreq.c udp_usrreq.c
src/sys/netinet6: raw_ip6.c udp6_usrreq.c
src/sys/netipsec: keysock.c
src/sys/netmpls: mpls_proto.c
src/sys/netnatm: natm.c
src/sys/rump/net/lib/libsockin: sockin.c
src/sys/sys: protosw.h un.h

Log Message:
split PRU_CONNECT function out of pr_generic() usrreq switches and put
into seaparate functions

  xxx_listen(struct socket *, struct mbuf *)

  - always KASSERT(solocked(so)) and KASSERT(nam != NULL)
  - replace calls to pr_generic() with req = PRU_CONNECT with
pr_connect()
  - rename existin {l2cap,sco,rfcomm}_connect() to
{l2cap,sco,rfcomm}_connect_pcb() respectively to permit
naming consistency with other protocols functions.
  - drop struct lwp * parameter from unp_connect() and at_pcbconnect()
and use curlwp instead where appropriate.

patch reviewed by rmind


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/bluetooth/bthidev.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/bluetooth/btmagic.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/bluetooth/btsco.c
cvs rdiff -u -r1.227 -r1.228 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.161 -r1.162 src/sys/kern/uipc_usrreq.c
cvs rdiff -u -r1.45 -r1.46 src/sys/net/raw_usrreq.c
cvs rdiff -u -r1.157 -r1.158 src/sys/net/rtsock.c
cvs rdiff -u -r1.55 -r1.56 src/sys/netatalk/ddp_usrreq.c
cvs rdiff -u -r1.34 -r1.35 src/sys/netbt/hci_socket.c
cvs rdiff -u -r1.15 -r1.16 src/sys/netbt/l2cap.h src/sys/netbt/l2cap_upper.c
cvs rdiff -u -r1.25 -r1.26 src/sys/netbt/l2cap_socket.c
cvs rdiff -u -r1.14 -r1.15 src/sys/netbt/rfcomm.h
cvs rdiff -u -r1.26 -r1.27 src/sys/netbt/rfcomm_socket.c
cvs rdiff -u -r1.17 -r1.18 src/sys/netbt/rfcomm_upper.c
cvs rdiff -u -r1.8 -r1.9 src/sys/netbt/sco.h
cvs rdiff -u -r1.27 -r1.28 src/sys/netbt/sco_socket.c
cvs rdiff -u -r1.13 -r1.14 src/sys/netbt/sco_upper.c
cvs rdiff -u -r1.136 -r1.137 src/sys/netinet/raw_ip.c
cvs rdiff -u -r1.192 -r1.193 src/sys/netinet/tcp_usrreq.c
cvs rdiff -u -r1.210 -r1.211 src/sys/netinet/udp_usrreq.c
cvs rdiff -u -r1.129 -r1.130 src/sys/netinet6/raw_ip6.c
cvs rdiff -u -r1.109 -r1.110 src/sys/netinet6/udp6_usrreq.c
cvs rdiff -u -r1.37 -r1.38 src/sys/netipsec/keysock.c
cvs rdiff -u -r1.17 -r1.18 src/sys/netmpls/mpls_proto.c
cvs rdiff -u -r1.39 -r1.40 src/sys/netnatm/natm.c
cvs rdiff -u -r1.52 -r1.53 src/sys/rump/net/lib/libsockin/sockin.c
cvs rdiff -u -r1.54 -r1.55 src/sys/sys/protosw.h
cvs rdiff -u -r1.49 -r1.50 src/sys/sys/un.h

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

Modified files:

Index: src/sys/dev/bluetooth/bthidev.c
diff -u src/sys/dev/bluetooth/bthidev.c:1.26 src/sys/dev/bluetooth/bthidev.c:1.27
--- src/sys/dev/bluetooth/bthidev.c:1.26	Thu Jul 24 15:12:03 2014
+++ src/sys/dev/bluetooth/bthidev.c	Wed Jul 30 10:04:25 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: bthidev.c,v 1.26 2014/07/24 15:12:03 rtr Exp $	*/
+/*	$NetBSD: bthidev.c,v 1.27 2014/07/30 10:04:25 rtr Exp $	*/
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bthidev.c,v 1.26 2014/07/24 15:12:03 rtr Exp $);
+__KERNEL_RCSID(0, $NetBSD: bthidev.c,v 1.27 2014/07/30 10:04:25 rtr Exp $);
 
 #include sys/param.h
 #include sys/condvar.h
@@ -577,9 +577,9 @@ bthidev_connect(struct bthidev_softc *sc
 
 	sa.bt_psm = sc-sc_ctlpsm;
 	bdaddr_copy(sa.bt_bdaddr, sc-sc_raddr);
-	err = l2cap_connect(sc-sc_ctl, sa);
+	err = l2cap_connect_pcb(sc-sc_ctl, sa);
 	if (err) {
-		aprint_error_dev(sc-sc_dev, l2cap_connect failed (%d)\n, err);
+		aprint_error_dev(sc-sc_dev, l2cap_connect_pcb failed (%d)\n, err);
 		return err;
 	}
 
@@ -753,7 +753,7 @@ bthidev_ctl_connected(void *arg)
 
 		sa.bt_psm = sc-sc_intpsm;
 		bdaddr_copy(sa.bt_bdaddr, sc-sc_raddr);
-		err = l2cap_connect(sc-sc_int, sa);
+		err = l2cap_connect_pcb(sc-sc_int, sa);
 		if (err)
 			goto fail;
 	}

Index: src/sys/dev/bluetooth/btmagic.c
diff -u src/sys/dev/bluetooth/btmagic.c:1.8 src/sys/dev/bluetooth/btmagic.c:1.9
--- src/sys/dev/bluetooth/btmagic.c:1.8	Thu Jul 24 15:12:03 2014
+++ src/sys/dev/bluetooth/btmagic.c	Wed Jul 30 10:04:25 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: btmagic.c,v 1.8 2014/07/24 15:12:03 rtr Exp $	*/
+/*	$NetBSD: btmagic.c,v 1.9 2014/07/30 10:04:25 rtr Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: btmagic.c,v 1.8

CVS commit: src/sys/arch/powerpc/booke/pci

2014-07-30 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Wed Jul 30 10:50:54 UTC 2014

Modified Files:
src/sys/arch/powerpc/booke/pci: pq3pci.c

Log Message:
pq3pci_config_addr_read is only used in a #if 0 block, so hide it under
the same condition.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/powerpc/booke/pci/pq3pci.c

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

Modified files:

Index: src/sys/arch/powerpc/booke/pci/pq3pci.c
diff -u src/sys/arch/powerpc/booke/pci/pq3pci.c:1.16 src/sys/arch/powerpc/booke/pci/pq3pci.c:1.17
--- src/sys/arch/powerpc/booke/pci/pq3pci.c:1.16	Sat Mar 29 19:28:29 2014
+++ src/sys/arch/powerpc/booke/pci/pq3pci.c	Wed Jul 30 10:50:54 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: pq3pci.c,v 1.16 2014/03/29 19:28:29 christos Exp $	*/
+/*	$NetBSD: pq3pci.c,v 1.17 2014/07/30 10:50:54 joerg Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -44,7 +44,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(0, $NetBSD: pq3pci.c,v 1.16 2014/03/29 19:28:29 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: pq3pci.c,v 1.17 2014/07/30 10:50:54 joerg Exp $);
 
 #include sys/param.h
 #include sys/device.h
@@ -998,6 +998,7 @@ pq3pci_make_tag(void *v, int bus, int de
 	return (bus  16) | (dev  11) | (func  8);
 }
 
+#if 0
 static inline pcitag_t
 pq3pci_config_addr_read(pci_chipset_tag_t pc)
 {
@@ -1006,6 +1007,7 @@ pq3pci_config_addr_read(pci_chipset_tag_
 __asm volatile(mbar\n\tmsync);
 	return v;
 }
+#endif
 
 static inline void
 pq3pci_config_addr_write(pci_chipset_tag_t pc, pcitag_t v)

CVS commit: src/sys/dev/pci

2014-07-30 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Wed Jul 30 12:34:12 UTC 2014

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
Add Intel Xeon E3-1200 v3 Host Bridge, DRAM.


To generate a diff of this commit:
cvs rdiff -u -r1.1198 -r1.1199 src/sys/dev/pci/pcidevs

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

Modified files:

Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1198 src/sys/dev/pci/pcidevs:1.1199
--- src/sys/dev/pci/pcidevs:1.1198	Fri Jul 25 20:13:05 2014
+++ src/sys/dev/pci/pcidevs	Wed Jul 30 12:34:12 2014
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1198 2014/07/25 20:13:05 msaitoh Exp $
+$NetBSD: pcidevs,v 1.1199 2014/07/30 12:34:12 msaitoh Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -2630,6 +2630,7 @@ product INTEL CORE4G_R_ULT_GT3_2 0x0a2e	
 product INTEL HASWELL_HOST_DRAM	0x0c00	Haswell Host Bridge, DRAM
 product INTEL HASWELL_PCIE16	0x0c01	Haswell PCI-E x16 Controller
 product INTEL HASWELL_PCIE8	0x0c05	Haswell PCI-E x8 Controller
+product INTEL XE3_12KV3_HOST_DRAM 0x0c08 Xeon E3-1200 v3 Host Bridge, DRAM
 product INTEL HASWELL_PCIE4	0x0c09	Haswell PCI-E x4 Controller
 product INTEL HASWELL_MINI_HDA	0x0c0c	Haswell Mini HD Audio Controller
 product INTEL S1200_PCIE_1	0x0c46	Atom S1200 PCIe Root Port 1

CVS commit: src/sys/arch/arm/omap

2014-07-30 Thread Michael Lorenz

Module Name:src
Committed By:   macallan
Date:   Wed Jul 30 12:45:44 UTC 2014

Modified Files:
src/sys/arch/arm/omap: omap3_sdmareg.h

Log Message:
fix tpyo


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/omap/omap3_sdmareg.h

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

Modified files:

Index: src/sys/arch/arm/omap/omap3_sdmareg.h
diff -u src/sys/arch/arm/omap/omap3_sdmareg.h:1.3 src/sys/arch/arm/omap/omap3_sdmareg.h:1.4
--- src/sys/arch/arm/omap/omap3_sdmareg.h:1.3	Wed Jan 16 20:32:24 2013
+++ src/sys/arch/arm/omap/omap3_sdmareg.h	Wed Jul 30 12:45:44 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: omap3_sdmareg.h,v 1.3 2013/01/16 20:32:24 macallan Exp $ */
+/*	$NetBSD: omap3_sdmareg.h,v 1.4 2014/07/30 12:45:44 macallan Exp $ */
 
 /*
  * Copyright (c) 2012 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: omap3_sdmareg.h,v 1.3 2013/01/16 20:32:24 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: omap3_sdmareg.h,v 1.4 2014/07/30 12:45:44 macallan Exp $);
 
 #ifndef OMAPDMA_REG_H
 #define OMAPDMA_REG_H
@@ -99,7 +99,7 @@ __KERNEL_RCSID(0, $NetBSD: omap3_sdmare
 	#define CCR_SEL_SRC_DST_SYNC		0x0100
 	#define CCR_PREFETCH			0x0080
 	#define CCR_SUPERVISOR			0x0040
-	#define CCR_SUNC_CONTROL_UPPER_MASK	0x0018
+	#define CCR_SYNC_CONTROL_UPPER_MASK	0x0018
 	#define CCR_BLOCK_SYNC			0x0004
 	#define CCR_TRANSPARENT_COPY_ENABLE	0x0002
 	#define CCR_CONST_FILL_ENABLE		0x0001

CVS commit: src/sys/arch/arm/arm

2014-07-30 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Wed Jul 30 13:31:17 UTC 2014

Modified Files:
src/sys/arch/arm/arm: cpufunc_asm_arm11x6.S

Log Message:
Use lower case.  No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/arm/cpufunc_asm_arm11x6.S

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

Modified files:

Index: src/sys/arch/arm/arm/cpufunc_asm_arm11x6.S
diff -u src/sys/arch/arm/arm/cpufunc_asm_arm11x6.S:1.6 src/sys/arch/arm/arm/cpufunc_asm_arm11x6.S:1.7
--- src/sys/arch/arm/arm/cpufunc_asm_arm11x6.S:1.6	Wed Jul 30 07:20:34 2014
+++ src/sys/arch/arm/arm/cpufunc_asm_arm11x6.S	Wed Jul 30 13:31:17 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpufunc_asm_arm11x6.S,v 1.6 2014/07/30 07:20:34 skrll Exp $	*/
+/*	$NetBSD: cpufunc_asm_arm11x6.S,v 1.7 2014/07/30 13:31:17 skrll Exp $	*/
 
 /*
  * Copyright (c) 2007 Microsoft
@@ -63,7 +63,7 @@
 #include machine/asm.h
 #include arm/locore.h
 
-RCSID($NetBSD: cpufunc_asm_arm11x6.S,v 1.6 2014/07/30 07:20:34 skrll Exp $)
+RCSID($NetBSD: cpufunc_asm_arm11x6.S,v 1.7 2014/07/30 13:31:17 skrll Exp $)
 
 #if 0
 #define Invalidate_I_cache(Rtmp1, Rtmp2) \
@@ -108,7 +108,7 @@ RCSID($NetBSD: cpufunc_asm_arm11x6.S,v 
 #define Flush_D_cache(reg) \
 1:	mov	reg, #0;		/* SBZ */	\
 	mcr	p15, 0, reg, c7, c14, 0;/* Clean and Invalidate Entire Data Cache */	\
-	mrc	p15, 0, reg, C7, C10, 6;/* Read Cache Dirty Status Register */		\
+	mrc	p15, 0, reg, c7, c10, 6;/* Read Cache Dirty Status Register */		\
 	ands	reg, reg, #01;		/* Check if it is clean */			\
 	bne	1b;			/* loop if not */\
 	mcr	p15, 0, reg, c7, c10, 4;/* Data Synchronization Barrier */

CVS commit: src/sys

2014-07-30 Thread Ryota Ozaki

Module Name:src
Committed By:   ozaki-r
Date:   Wed Jul 30 13:32:09 UTC 2014

Modified Files:
src/sys/conf: files
src/sys/net: if.c
Added Files:
src/sys/rump/net/lib/libnetinet/opt: ether.h opt_wlan.h

Log Message:
Call etherinit from ifinit1 only when it is required

This unbreaks the builds of kernels that don't build if_ethersubr.c.


To generate a diff of this commit:
cvs rdiff -u -r1.1094 -r1.1095 src/sys/conf/files
cvs rdiff -u -r1.287 -r1.288 src/sys/net/if.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libnetinet/opt/ether.h \
src/sys/rump/net/lib/libnetinet/opt/opt_wlan.h

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

Modified files:

Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1094 src/sys/conf/files:1.1095
--- src/sys/conf/files:1.1094	Wed Jul 16 18:22:23 2014
+++ src/sys/conf/files	Wed Jul 30 13:32:09 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1094 2014/07/16 18:22:23 bouyer Exp $
+#	$NetBSD: files,v 1.1095 2014/07/30 13:32:09 ozaki-r Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20100430
@@ -1708,7 +1708,7 @@ file	net/bridgestp.c			bridge
 file	net/if_ecosubr.c		eco
 file	net/if_etherip.c		etherip			needs-flag
 file	net/if_ethersubr.c		ether | fddi | netatalk | token |
-	wlan
+	wlan		needs-flag
 file	net/if_faith.c			faith  (inet | inet6)	needs-flag
 file	net/if_fddisubr.c		fddi			needs-flag
 file	net/if_gif.c			gif			needs-flag

Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.287 src/sys/net/if.c:1.288
--- src/sys/net/if.c:1.287	Tue Jul 29 05:56:58 2014
+++ src/sys/net/if.c	Wed Jul 30 13:32:09 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: if.c,v 1.287 2014/07/29 05:56:58 ozaki-r Exp $	*/
+/*	$NetBSD: if.c,v 1.288 2014/07/30 13:32:09 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,12 +90,13 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if.c,v 1.287 2014/07/29 05:56:58 ozaki-r Exp $);
+__KERNEL_RCSID(0, $NetBSD: if.c,v 1.288 2014/07/30 13:32:09 ozaki-r Exp $);
 
 #include opt_inet.h
 
 #include opt_atalk.h
 #include opt_natm.h
+#include opt_wlan.h
 
 #include sys/param.h
 #include sys/mbuf.h
@@ -138,6 +139,10 @@ __KERNEL_RCSID(0, $NetBSD: if.c,v 1.287
 #include netinet6/nd6.h
 #endif
 
+#include ether.h
+#include fddi.h
+#include token.h
+
 #include carp.h
 #if NCARP  0
 #include netinet/ip_carp.h
@@ -253,7 +258,9 @@ ifinit1(void)
 	if_pfil = pfil_head_create(PFIL_TYPE_IFNET, NULL);
 	KASSERT(if_pfil != NULL);
 
+#if NETHER  0 || NFDDI  0 || defined(NETATALK) || NTOKEN  0 || defined(WLAN)
 	etherinit();
+#endif
 }
 
 ifnet_t *

Added files:

Index: src/sys/rump/net/lib/libnetinet/opt/ether.h
diff -u /dev/null src/sys/rump/net/lib/libnetinet/opt/ether.h:1.1
--- /dev/null	Wed Jul 30 13:32:09 2014
+++ src/sys/rump/net/lib/libnetinet/opt/ether.h	Wed Jul 30 13:32:09 2014
@@ -0,0 +1,3 @@
+/*	$NetBSD: ether.h,v 1.1 2014/07/30 13:32:09 ozaki-r Exp $	*/
+
+/* dummy */
Index: src/sys/rump/net/lib/libnetinet/opt/opt_wlan.h
diff -u /dev/null src/sys/rump/net/lib/libnetinet/opt/opt_wlan.h:1.1
--- /dev/null	Wed Jul 30 13:32:09 2014
+++ src/sys/rump/net/lib/libnetinet/opt/opt_wlan.h	Wed Jul 30 13:32:09 2014
@@ -0,0 +1,3 @@
+/*	$NetBSD: opt_wlan.h,v 1.1 2014/07/30 13:32:09 ozaki-r Exp $	*/
+
+/* dummy */

CVS commit: src/sys/arch/sparc64/sparc64

2014-07-30 Thread Palle Lyckegaard

Module Name:src
Committed By:   palle
Date:   Wed Jul 30 13:50:33 UTC 2014

Modified Files:
src/sys/arch/sparc64/sparc64: locore.s

Log Message:
Fix ALTERNATE_GLOBALS so it at least works on sun4u - using a scratch register 
is not a good idea...


To generate a diff of this commit:
cvs rdiff -u -r1.368 -r1.369 src/sys/arch/sparc64/sparc64/locore.s

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

Modified files:

Index: src/sys/arch/sparc64/sparc64/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.368 src/sys/arch/sparc64/sparc64/locore.s:1.369
--- src/sys/arch/sparc64/sparc64/locore.s:1.368	Sun Jul 27 16:37:47 2014
+++ src/sys/arch/sparc64/sparc64/locore.s	Wed Jul 30 13:50:33 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.368 2014/07/27 16:37:47 palle Exp $	*/
+/*	$NetBSD: locore.s,v 1.369 2014/07/30 13:50:33 palle Exp $	*/
 
 /*
  * Copyright (c) 2006-2010 Matthew R. Green
@@ -160,23 +160,8 @@
 3:
 	.endm
 
-	.macro	ALTERNATE_GLOBALS scratch
-#ifdef SUN4V
-	sethi	%hi(cputyp), \scratch
-	ld	[\scratch + %lo(cputyp)], \scratch
-	cmp	\scratch, CPU_SUN4V
-	bne,pt	%icc, 2f
-	 nop
-	/* sun4v */
-	ba	3f
-	 wrpr	%g0, 1, %gl
-2:		
-#endif	
-	/* sun4u */
-	rdpr	 %pstate, \scratch
-	or	\scratch, PSTATE_AG, \scratch	! Alternate Globals (AG) bit set to one
-	wrpr	%g0, \scratch, %pstate
-3:
+	.macro	ALTERNATE_GLOBALS
+	 wrpr%g0, PSTATE_KERN|PSTATE_AG, %pstate	! sun4u only for now...
 	.endm
 	
 	.macro	ENABLE_INTERRUPTS scratch
@@ -3954,7 +3939,7 @@ return_from_trap:
 #ifdef TRAPS_USE_IG
 	wrpr	%g0, PSTATE_KERN|PSTATE_IG, %pstate	! DEBUG
 #else
-	ALTERNATE_GLOBALS %g7		! Assuming %g7 is ok to trash
+	ALTERNATE_GLOBALS
 #endif
 	ldx	[%sp + CC64FSZ + STKB + TF_O + (0*8)], %i0
 	ldx	[%sp + CC64FSZ + STKB + TF_O + (1*8)], %i1

CVS import: src/external/bsd/dhcpcd/dist

2014-07-30 Thread Roy Marples

Module Name:src
Committed By:   roy
Date:   Wed Jul 30 15:44:12 UTC 2014

Update of /cvsroot/src/external/bsd/dhcpcd/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv26100

Log Message:
Import dhcpcd-6.4.3 with the following changes:

  *  Correct DHCPv6 Prefix Delegation option decoding
  *  Poll interfaces on BSD for IFF_RUNNING if link state cannot be obtained
  *  Check for an IA to use in DHCPv6 lease validation
  *  Warn about exceeding IDGEN_RETRIES when a stable private address cannot
 be obtained
  *  Fix DHCP option overload handling, thanks to Tobias Stoeckmann


Status:

Vendor Tag: roy
Release Tags:   dhcpcd-6-4-3

U src/external/bsd/dhcpcd/dist/common.c
U src/external/bsd/dhcpcd/dist/control.c
C src/external/bsd/dhcpcd/dist/dhcpcd.c
U src/external/bsd/dhcpcd/dist/duid.c
U src/external/bsd/dhcpcd/dist/eloop.c
U src/external/bsd/dhcpcd/dist/if.c
C src/external/bsd/dhcpcd/dist/if-options.c
U src/external/bsd/dhcpcd/dist/script.c
U src/external/bsd/dhcpcd/dist/dhcp-common.c
U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c
U src/external/bsd/dhcpcd/dist/if-bsd.c
U src/external/bsd/dhcpcd/dist/arp.c
C src/external/bsd/dhcpcd/dist/dhcp.c
U src/external/bsd/dhcpcd/dist/ipv4.c
U src/external/bsd/dhcpcd/dist/ipv4ll.c
U src/external/bsd/dhcpcd/dist/ipv6.c
C src/external/bsd/dhcpcd/dist/ipv6nd.c
U src/external/bsd/dhcpcd/dist/dhcp6.c
U src/external/bsd/dhcpcd/dist/auth.c
U src/external/bsd/dhcpcd/dist/dhcpcd.conf
U src/external/bsd/dhcpcd/dist/dhcpcd-definitions.conf
U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c.in
U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h.in
U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in
U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in
U src/external/bsd/dhcpcd/dist/dhcpcd.8.in
C src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in
U src/external/bsd/dhcpcd/dist/arp.h
U src/external/bsd/dhcpcd/dist/auth.h
U src/external/bsd/dhcpcd/dist/bpf-filter.h
U src/external/bsd/dhcpcd/dist/common.h
U src/external/bsd/dhcpcd/dist/config.h
U src/external/bsd/dhcpcd/dist/control.h
U src/external/bsd/dhcpcd/dist/defs.h
U src/external/bsd/dhcpcd/dist/dev.h
U src/external/bsd/dhcpcd/dist/dhcp-common.h
U src/external/bsd/dhcpcd/dist/dhcp.h
U src/external/bsd/dhcpcd/dist/dhcp6.h
U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h
U src/external/bsd/dhcpcd/dist/dhcpcd.h
U src/external/bsd/dhcpcd/dist/duid.h
U src/external/bsd/dhcpcd/dist/eloop.h
U src/external/bsd/dhcpcd/dist/if-options.h
U src/external/bsd/dhcpcd/dist/if.h
U src/external/bsd/dhcpcd/dist/ipv4.h
U src/external/bsd/dhcpcd/dist/ipv4ll.h
U src/external/bsd/dhcpcd/dist/ipv6.h
U src/external/bsd/dhcpcd/dist/ipv6nd.h
U src/external/bsd/dhcpcd/dist/script.h
U src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c
U src/external/bsd/dhcpcd/dist/crypt/crypt.h
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind

5 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jroy:yesterday -jroy src/external/bsd/dhcpcd/dist

CVS commit: src/external/bsd/dhcpcd/dist

2014-07-30 Thread Roy Marples

Module Name:src
Committed By:   roy
Date:   Wed Jul 30 15:47:32 UTC 2014

Modified Files:
src/external/bsd/dhcpcd/dist: dhcp.c dhcpcd.c dhcpcd.conf.5.in
if-options.c ipv6nd.c

Log Message:
Sync


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/dhcpcd/dist/dhcp.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/dhcpcd/dist/dhcpcd.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in \
src/external/bsd/dhcpcd/dist/ipv6nd.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/dhcpcd/dist/if-options.c

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

Modified files:

Index: src/external/bsd/dhcpcd/dist/dhcp.c
diff -u src/external/bsd/dhcpcd/dist/dhcp.c:1.14 src/external/bsd/dhcpcd/dist/dhcp.c:1.15
--- src/external/bsd/dhcpcd/dist/dhcp.c:1.14	Mon Jul 14 11:49:48 2014
+++ src/external/bsd/dhcpcd/dist/dhcp.c	Wed Jul 30 15:47:32 2014
@@ -1,5 +1,5 @@
 #include sys/cdefs.h
- __RCSID($NetBSD: dhcp.c,v 1.14 2014/07/14 11:49:48 roy Exp $);
+ __RCSID($NetBSD: dhcp.c,v 1.15 2014/07/30 15:47:32 roy Exp $);
 
 /*
  * dhcpcd - DHCP client daemon
@@ -58,6 +58,7 @@
 #include syslog.h
 #include unistd.h
 
+#define ELOOP_QUEUE 2
 #include config.h
 #include arp.h
 #include common.h
@@ -205,9 +206,12 @@ get_option(struct dhcpcd_ctx *ctx,
 goto exit;
 			break;
 		case DHO_OPTIONSOVERLOADED:
-			/* Ensure we only get this option once */
+			/* Ensure we only get this option once by setting
+			 * the last bit as well as the value.
+			 * This is valid because only the first two bits
+			 * actually mean anything in RFC2132 Section 9.3 */
 			if (!overl)
-overl = p[1];
+overl = 0x80 | p[1];
 			break;
 		}
 		l = *p++;

Index: src/external/bsd/dhcpcd/dist/dhcpcd.c
diff -u src/external/bsd/dhcpcd/dist/dhcpcd.c:1.6 src/external/bsd/dhcpcd/dist/dhcpcd.c:1.7
--- src/external/bsd/dhcpcd/dist/dhcpcd.c:1.6	Mon Jul 14 11:49:48 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd.c	Wed Jul 30 15:47:32 2014
@@ -1,5 +1,5 @@
 #include sys/cdefs.h
- __RCSID($NetBSD: dhcpcd.c,v 1.6 2014/07/14 11:49:48 roy Exp $);
+ __RCSID($NetBSD: dhcpcd.c,v 1.7 2014/07/30 15:47:32 roy Exp $);
 
 /*
  * dhcpcd - DHCP client daemon
@@ -345,8 +345,6 @@ configure_interface1(struct interface *i
 		ifo-options = ~(DHCPCD_ARP | DHCPCD_IPV4LL);
 	if (!(ifp-flags  (IFF_POINTOPOINT | IFF_LOOPBACK | IFF_MULTICAST)))
 		ifo-options = ~DHCPCD_IPV6RS;
-	if (ifo-options  DHCPCD_LINK  ifp-carrier == LINK_UNKNOWN)
-		ifo-options = ~DHCPCD_LINK;
 
 	if (ifo-metric != -1)
 		ifp-metric = (unsigned int)ifo-metric;
@@ -613,14 +611,33 @@ dhcpcd_startinterface(void *arg)
 	struct if_options *ifo = ifp-options;
 	size_t i;
 	char buf[DUID_LEN * 3];
+	struct timeval tv;
 
 	pre_start(ifp);
 	if (if_up(ifp) == -1)
 		syslog(LOG_ERR, %s: if_up: %m, ifp-name);
 
-	if (ifp-carrier == LINK_DOWN  ifo-options  DHCPCD_LINK) {
-		syslog(LOG_INFO, %s: waiting for carrier, ifp-name);
-		return;
+	if (ifo-options  DHCPCD_LINK) {
+link_retry:
+		switch (ifp-carrier) {
+		case LINK_UP:
+			break;
+		case LINK_DOWN:
+			syslog(LOG_INFO, %s: waiting for carrier, ifp-name);
+			return;
+		case LINK_UNKNOWN:
+			/* No media state available, so we loop until
+			 * IFF_UP and IFF_RUNNING are set. */
+			ifp-carrier = if_carrier(ifp);
+			if (ifp-carrier != LINK_UNKNOWN)
+goto link_retry;
+			syslog(LOG_INFO, %s: unknown carrier, ifp-name);
+			tv.tv_sec = 0;
+			tv.tv_usec = 100;
+			eloop_timeout_add_tv(ifp-ctx-eloop, tv,
+			dhcpcd_startinterface, ifp);
+			return;
+		}
 	}
 
 	if (ifo-options  (DHCPCD_DUID | DHCPCD_IPV6)) {

Index: src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in
diff -u src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in:1.9 src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in:1.10
--- src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in:1.9	Mon Jul 14 11:49:48 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in	Wed Jul 30 15:47:32 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: dhcpcd.conf.5.in,v 1.9 2014/07/14 11:49:48 roy Exp $
+.\ $NetBSD: dhcpcd.conf.5.in,v 1.10 2014/07/30 15:47:32 roy Exp $
 .\ Copyright (c) 2006-2014 Roy Marples
 .\ All rights reserved
 .\
@@ -23,7 +23,7 @@
 .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\ SUCH DAMAGE.
 .\
-.Dd July 7, 2014
+.Dd July 14, 2014
 .Dt DHCPCD.CONF 5
 .Os
 .Sh NAME
@@ -264,7 +264,7 @@ of 64 is assumed, unless the maximum
 does not fit.
 In this case
 .Ar prefix_len
-is increased to the highest multiple of 8 that can accomodate the
+is increased to the highest multiple of 8 that can accommodate the
 .Ar sla_id .
 .Ar sla_id
 is an integer and is added to the prefix which must fit inside
@@ -653,7 +653,7 @@ This option cannot be requested, regardl
 .It Ic index
 The option can appear more than once and will be indexed.
 .It Ic array
-The option data is split into a space seperated array, each element being
+The option data is split into a space separated array, each element being
 the

CVS commit: src/sys/arch/evbppc/walnut

2014-07-30 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Wed Jul 30 19:33:56 UTC 2014

Modified Files:
src/sys/arch/evbppc/walnut: autoconf.c

Log Message:
Second argument of config_rootfound is void *, so discard const
explicitly.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbppc/walnut/autoconf.c

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

Modified files:

Index: src/sys/arch/evbppc/walnut/autoconf.c
diff -u src/sys/arch/evbppc/walnut/autoconf.c:1.21 src/sys/arch/evbppc/walnut/autoconf.c:1.22
--- src/sys/arch/evbppc/walnut/autoconf.c:1.21	Sun Jul 29 18:05:42 2012
+++ src/sys/arch/evbppc/walnut/autoconf.c	Wed Jul 30 19:33:56 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.21 2012/07/29 18:05:42 mlelstv Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.22 2014/07/30 19:33:56 joerg Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.21 2012/07/29 18:05:42 mlelstv Exp $);
+__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.22 2014/07/30 19:33:56 joerg Exp $);
 
 #include sys/param.h
 #include sys/conf.h
@@ -68,7 +68,7 @@ cpu_configure(void)
 	/* Make sure that timers run at CPU frequency */
 	mtdcr(DCR_CPC0_CR1, mfdcr(DCR_CPC0_CR1)  ~CPC0_CR1_CETE);
 
-	if (config_rootfound(plb, local_plb_devs) == NULL)
+	if (config_rootfound(plb, __UNCONST(local_plb_devs)) == NULL)
 		panic(configure: plb not configured);
 
 	(void)spl0();

CVS commit: src/sys/arch/arm/arm

2014-07-30 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Wed Jul 30 20:52:18 UTC 2014

Modified Files:
src/sys/arch/arm/arm: cpufunc.c

Log Message:
Apply some errata workarounds


To generate a diff of this commit:
cvs rdiff -u -r1.148 -r1.149 src/sys/arch/arm/arm/cpufunc.c

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

Modified files:

Index: src/sys/arch/arm/arm/cpufunc.c
diff -u src/sys/arch/arm/arm/cpufunc.c:1.148 src/sys/arch/arm/arm/cpufunc.c:1.149
--- src/sys/arch/arm/arm/cpufunc.c:1.148	Sun Jul 27 21:31:34 2014
+++ src/sys/arch/arm/arm/cpufunc.c	Wed Jul 30 20:52:18 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpufunc.c,v 1.148 2014/07/27 21:31:34 skrll Exp $	*/
+/*	$NetBSD: cpufunc.c,v 1.149 2014/07/30 20:52:18 skrll Exp $	*/
 
 /*
  * arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpufunc.c,v 1.148 2014/07/27 21:31:34 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpufunc.c,v 1.149 2014/07/30 20:52:18 skrll Exp $);
 
 #include opt_compat_netbsd.h
 #include opt_cpuoptions.h
@@ -3204,9 +3204,24 @@ arm11x6_setup(char *args)
 	}
 
 	/*
-	 * Enable an errata workaround
+	 * This enables the workaround for the following ARM1176 r0pX
+	 * errata.
+	 *
+	 * 394601: In low interrupt latency configuration, interrupted clean
+	 * and invalidate operation may not clean dirty data.
+	 *
+	 * 716151: Clean Data Cache line by MVA can corrupt subsequent
+	 * stores to the same cache line.
+	 *
+	 * 714068: Prefetch Instruction Cache Line or Invalidate Instruction
+	 * Cache Line by MVA can cause deadlock.
 	 */
 	if ((cpuid  CPU_ID_CPU_MASK) == CPU_ID_ARM1176JZS) { /* ARM1176JZSr0 */
+		/* 394601 and 716151 */
+		cpuctrl |= CPU_CONTROL_FI_ENABLE;
+		auxctrl |= ARM1176_AUXCTL_FIO;
+
+		/* 714068 */
 		auxctrl |= ARM1176_AUXCTL_PHD;
 	}

CVS commit: src/sys/arch

2014-07-30 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Wed Jul 30 22:45:21 UTC 2014

Modified Files:
src/sys/arch/evbppc/mpc85xx: mpc85xx_start.S
src/sys/arch/powerpc/powerpc: locore_subr.S

Log Message:
Build 32bit constant with lis+ori, not lis+addi. The instructions
differ on the sign extension handling of the immediate.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/powerpc/powerpc/locore_subr.S

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

Modified files:

Index: src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S
diff -u src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S:1.6 src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S:1.7
--- src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S:1.6	Sun Jul 29 21:36:27 2012
+++ src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S	Wed Jul 30 22:45:21 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: mpc85xx_start.S,v 1.6 2012/07/29 21:36:27 matt Exp $	*/
+/*	$NetBSD: mpc85xx_start.S,v 1.7 2014/07/30 22:45:21 joerg Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -37,7 +37,7 @@
 #include sys/cdefs.h
 #include powerpc/asm.h
 
-RCSID($NetBSD: mpc85xx_start.S,v 1.6 2012/07/29 21:36:27 matt Exp $)
+RCSID($NetBSD: mpc85xx_start.S,v 1.7 2014/07/30 22:45:21 joerg Exp $)
 
 #include opt_altivec.h
 #include opt_ddb.h
@@ -87,7 +87,7 @@ __start:
 	 * Set all the registers we don't care about to a known junk value.
 	 */
 	lis	%r2,0xdeadbeef@ha
-	addi	%r2,%r2,0xdeadbeef@l
+	ori	%r2,%r2,0xdeadbeef@l
 	mr	%r9,%r2
 	mr	%r10,%r9
 	mr	%r11,%r9

Index: src/sys/arch/powerpc/powerpc/locore_subr.S
diff -u src/sys/arch/powerpc/powerpc/locore_subr.S:1.51 src/sys/arch/powerpc/powerpc/locore_subr.S:1.52
--- src/sys/arch/powerpc/powerpc/locore_subr.S:1.51	Tue Jul 29 19:15:47 2014
+++ src/sys/arch/powerpc/powerpc/locore_subr.S	Wed Jul 30 22:45:21 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore_subr.S,v 1.51 2014/07/29 19:15:47 joerg Exp $	*/
+/*	$NetBSD: locore_subr.S,v 1.52 2014/07/30 22:45:21 joerg Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -509,7 +509,7 @@ _ENTRY(cpu_lwp_bootstrap)
 	lwz	%r31, FRAME_SRR1(%r1)	/* trapexit wants srr1 in r31 */
 #ifdef PPC_BOOKE
 	lis	%r30, 0xbeeffeed@ha
-	addi	%r30, %r30, 0xbeeffeed@l
+	ori	%r30, %r30, 0xbeeffeed@l
 	andis.	%r0,%r31,PSL_CE@h
 	tweqi	%r0,0
 	andi.	%r0,%r31,PSL_DE@l

CVS commit: src/sys/arch

2014-07-30 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Wed Jul 30 23:15:23 UTC 2014

Modified Files:
src/sys/arch/evbppc/mpc85xx: mpc85xx_start.S
src/sys/arch/powerpc/powerpc: locore_subr.S

Log Message:
Correct last, ha+l uses lis+addi, so use h+l.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/powerpc/powerpc/locore_subr.S

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

Modified files:

Index: src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S
diff -u src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S:1.7 src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S:1.8
--- src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S:1.7	Wed Jul 30 22:45:21 2014
+++ src/sys/arch/evbppc/mpc85xx/mpc85xx_start.S	Wed Jul 30 23:15:23 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: mpc85xx_start.S,v 1.7 2014/07/30 22:45:21 joerg Exp $	*/
+/*	$NetBSD: mpc85xx_start.S,v 1.8 2014/07/30 23:15:23 joerg Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -37,7 +37,7 @@
 #include sys/cdefs.h
 #include powerpc/asm.h
 
-RCSID($NetBSD: mpc85xx_start.S,v 1.7 2014/07/30 22:45:21 joerg Exp $)
+RCSID($NetBSD: mpc85xx_start.S,v 1.8 2014/07/30 23:15:23 joerg Exp $)
 
 #include opt_altivec.h
 #include opt_ddb.h
@@ -86,7 +86,7 @@ __start:
 	/*
 	 * Set all the registers we don't care about to a known junk value.
 	 */
-	lis	%r2,0xdeadbeef@ha
+	lis	%r2,0xdeadbeef@h
 	ori	%r2,%r2,0xdeadbeef@l
 	mr	%r9,%r2
 	mr	%r10,%r9

Index: src/sys/arch/powerpc/powerpc/locore_subr.S
diff -u src/sys/arch/powerpc/powerpc/locore_subr.S:1.52 src/sys/arch/powerpc/powerpc/locore_subr.S:1.53
--- src/sys/arch/powerpc/powerpc/locore_subr.S:1.52	Wed Jul 30 22:45:21 2014
+++ src/sys/arch/powerpc/powerpc/locore_subr.S	Wed Jul 30 23:15:23 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore_subr.S,v 1.52 2014/07/30 22:45:21 joerg Exp $	*/
+/*	$NetBSD: locore_subr.S,v 1.53 2014/07/30 23:15:23 joerg Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -508,7 +508,7 @@ _ENTRY(cpu_lwp_bootstrap)
 	blrl/* jump indirect to r31 */
 	lwz	%r31, FRAME_SRR1(%r1)	/* trapexit wants srr1 in r31 */
 #ifdef PPC_BOOKE
-	lis	%r30, 0xbeeffeed@ha
+	lis	%r30, 0xbeeffeed@h
 	ori	%r30, %r30, 0xbeeffeed@l
 	andis.	%r0,%r31,PSL_CE@h
 	tweqi	%r0,0

CVS commit: src/sys/arch/powerpc/powerpc

2014-07-30 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Wed Jul 30 23:27:55 UTC 2014

Modified Files:
src/sys/arch/powerpc/powerpc: locore_subr.S

Log Message:
Fix diagnostic trap to be correct.  PSL_EE@l would be sign-extended and this
could never match the result of the andi. before it.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/powerpc/powerpc/locore_subr.S

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

Modified files:

Index: src/sys/arch/powerpc/powerpc/locore_subr.S
diff -u src/sys/arch/powerpc/powerpc/locore_subr.S:1.53 src/sys/arch/powerpc/powerpc/locore_subr.S:1.54
--- src/sys/arch/powerpc/powerpc/locore_subr.S:1.53	Wed Jul 30 23:15:23 2014
+++ src/sys/arch/powerpc/powerpc/locore_subr.S	Wed Jul 30 23:27:55 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore_subr.S,v 1.53 2014/07/30 23:15:23 joerg Exp $	*/
+/*	$NetBSD: locore_subr.S,v 1.54 2014/07/30 23:27:55 matt Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -304,7 +304,7 @@ ENTRY_NOPROFILE(emptyidlespin)
 	twnei	%r4,IPL_NONE
 	mfmsr	%r5
 	andi.	%r5,%r5,PSL_EE@l
-	tweqi	%r5,PSL_EE@l
+	tweqi	%r5,0
 #endif
 	blr/* CPUINIT needs a raw blr */

CVS commit: src/sys/arch/powerpc/booke

2014-07-30 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Wed Jul 30 23:56:01 UTC 2014

Modified Files:
src/sys/arch/powerpc/booke: trap.c trap_subr.S

Log Message:
Replace mfpir with mfspr r, 286. The Power ISA and GAS disagree on the
semantics of this instruction, so prefer the well defined replacement.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/powerpc/booke/trap.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/booke/trap_subr.S

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

Modified files:

Index: src/sys/arch/powerpc/booke/trap.c
diff -u src/sys/arch/powerpc/booke/trap.c:1.23 src/sys/arch/powerpc/booke/trap.c:1.24
--- src/sys/arch/powerpc/booke/trap.c:1.23	Fri Aug 23 06:19:46 2013
+++ src/sys/arch/powerpc/booke/trap.c	Wed Jul 30 23:56:01 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.23 2013/08/23 06:19:46 matt Exp $	*/
+/*	$NetBSD: trap.c,v 1.24 2014/07/30 23:56:01 joerg Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -38,7 +38,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: trap.c,v 1.23 2013/08/23 06:19:46 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: trap.c,v 1.24 2014/07/30 23:56:01 joerg Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -428,7 +428,7 @@ emulate_opcode(struct trapframe *tf, ksi
 	}
 
 	if (OPC_MFSPR_P(opcode, SPR_PIR)) {
-		__asm (mfpir %0 : =r(tf-tf_fixreg[OPC_MFSPR_REG(opcode)]));
+		__asm (mfspr %0, 286 : =r(tf-tf_fixreg[OPC_MFSPR_REG(opcode)]));
 		return true;
 	}
 

Index: src/sys/arch/powerpc/booke/trap_subr.S
diff -u src/sys/arch/powerpc/booke/trap_subr.S:1.8 src/sys/arch/powerpc/booke/trap_subr.S:1.9
--- src/sys/arch/powerpc/booke/trap_subr.S:1.8	Wed Aug  1 16:19:43 2012
+++ src/sys/arch/powerpc/booke/trap_subr.S	Wed Jul 30 23:56:01 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap_subr.S,v 1.8 2012/08/01 16:19:43 matt Exp $	*/
+/*	$NetBSD: trap_subr.S,v 1.9 2014/07/30 23:56:01 joerg Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -34,7 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-RCSID($NetBSD: trap_subr.S,v 1.8 2012/08/01 16:19:43 matt Exp $)
+RCSID($NetBSD: trap_subr.S,v 1.9 2014/07/30 23:56:01 joerg Exp $)
 
 	.globl	_C_LABEL(sctrapexit), _C_LABEL(trapexit), _C_LABEL(intrcall)
 
@@ -858,7 +858,7 @@ _C_LABEL(exception_init):
 	ori	%r5,%r6,_C_LABEL(perfmon_vector)@l
 	mtspr	SPR_IVOR35, %r5
 
-	mfpir	%r5		/* get Process ID register */
+	mfspr	%r5, 286	/* get Process ID register */
 	cmplwi	%r5,0
 	bnelr			/* return if non-0 (non-primary) */

CVS commit: src/sys/netinet

2014-07-30 Thread Ryota Ozaki

Module Name:src
Committed By:   ozaki-r
Date:   Thu Jul 31 00:56:24 UTC 2014

Modified Files:
src/sys/netinet: ip_carp.c

Log Message:
Make local functions/variables static

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/netinet/ip_carp.c

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

Modified files:

Index: src/sys/netinet/ip_carp.c
diff -u src/sys/netinet/ip_carp.c:1.57 src/sys/netinet/ip_carp.c:1.58
--- src/sys/netinet/ip_carp.c:1.57	Fri Jun  6 01:02:47 2014
+++ src/sys/netinet/ip_carp.c	Thu Jul 31 00:56:23 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_carp.c,v 1.57 2014/06/06 01:02:47 rmind Exp $	*/
+/*	$NetBSD: ip_carp.c,v 1.58 2014/07/31 00:56:23 ozaki-r Exp $	*/
 /*	$OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
 #include opt_mbuftrace.h
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ip_carp.c,v 1.57 2014/06/06 01:02:47 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: ip_carp.c,v 1.58 2014/07/31 00:56:23 ozaki-r Exp $);
 
 /*
  * TODO:
@@ -153,8 +153,8 @@ struct carp_softc {
 	LIST_HEAD(__carp_mchead, carp_mc_entry)	carp_mc_listhead;
 };
 
-int carp_suppress_preempt = 0;
-int carp_opts[CARPCTL_MAXID] = { 0, 1, 0, 0, 0 };	/* XXX for now */
+static int carp_suppress_preempt = 0;
+static int carp_opts[CARPCTL_MAXID] = { 0, 1, 0, 0, 0 };	/* XXX for now */
 
 static percpu_t *carpstat_percpu;
 
@@ -185,47 +185,50 @@ struct carp_if {
 		addlog(\n);		\
 	}
 
-void	carp_hmac_prepare(struct carp_softc *);
-void	carp_hmac_generate(struct carp_softc *, u_int32_t *,
-	unsigned char *);
-int	carp_hmac_verify(struct carp_softc *, u_int32_t *,
-	unsigned char *);
-void	carp_setroute(struct carp_softc *, int);
-void	carp_proto_input_c(struct mbuf *, struct carp_header *, sa_family_t);
+static void	carp_hmac_prepare(struct carp_softc *);
+static void	carp_hmac_generate(struct carp_softc *, u_int32_t *,
+		unsigned char *);
+static int	carp_hmac_verify(struct carp_softc *, u_int32_t *,
+		unsigned char *);
+static void	carp_setroute(struct carp_softc *, int);
+static void	carp_proto_input_c(struct mbuf *, struct carp_header *,
+		sa_family_t);
 void	carpattach(int);
-void	carpdetach(struct carp_softc *);
-int	carp_prepare_ad(struct mbuf *, struct carp_softc *,
-	struct carp_header *);
-void	carp_send_ad_all(void);
-void	carp_send_ad(void *);
-void	carp_send_arp(struct carp_softc *);
-void	carp_master_down(void *);
-int	carp_ioctl(struct ifnet *, u_long, void *);
-void	carp_start(struct ifnet *);
-void	carp_setrun(struct carp_softc *, sa_family_t);
-void	carp_set_state(struct carp_softc *, int);
-int	carp_addrcount(struct carp_if *, struct in_ifaddr *, int);
+static void	carpdetach(struct carp_softc *);
+static int	carp_prepare_ad(struct mbuf *, struct carp_softc *,
+		struct carp_header *);
+static void	carp_send_ad_all(void);
+static void	carp_send_ad(void *);
+static void	carp_send_arp(struct carp_softc *);
+static void	carp_master_down(void *);
+static int	carp_ioctl(struct ifnet *, u_long, void *);
+static void	carp_start(struct ifnet *);
+static void	carp_setrun(struct carp_softc *, sa_family_t);
+static void	carp_set_state(struct carp_softc *, int);
+static int	carp_addrcount(struct carp_if *, struct in_ifaddr *, int);
 enum	{ CARP_COUNT_MASTER, CARP_COUNT_RUNNING };
 
-void	carp_multicast_cleanup(struct carp_softc *);
-int	carp_set_ifp(struct carp_softc *, struct ifnet *);
-void	carp_set_enaddr(struct carp_softc *);
-void	carp_addr_updated(void *);
-u_int32_t	carp_hash(struct carp_softc *, u_char *);
-int	carp_set_addr(struct carp_softc *, struct sockaddr_in *);
-int	carp_join_multicast(struct carp_softc *);
+static void	carp_multicast_cleanup(struct carp_softc *);
+static int	carp_set_ifp(struct carp_softc *, struct ifnet *);
+static void	carp_set_enaddr(struct carp_softc *);
+#if 0
+static void	carp_addr_updated(void *);
+#endif
+static u_int32_t	carp_hash(struct carp_softc *, u_char *);
+static int	carp_set_addr(struct carp_softc *, struct sockaddr_in *);
+static int	carp_join_multicast(struct carp_softc *);
 #ifdef INET6
-void	carp_send_na(struct carp_softc *);
-int	carp_set_addr6(struct carp_softc *, struct sockaddr_in6 *);
-int	carp_join_multicast6(struct carp_softc *);
+static void	carp_send_na(struct carp_softc *);
+static int	carp_set_addr6(struct carp_softc *, struct sockaddr_in6 *);
+static int	carp_join_multicast6(struct carp_softc *);
 #endif
-int	carp_clone_create(struct if_clone *, int);
-int	carp_clone_destroy(struct ifnet *);
-int	carp_ether_addmulti(struct carp_softc *, struct ifreq *);
-int	carp_ether_delmulti(struct carp_softc *, struct ifreq *);
-void	carp_ether_purgemulti(struct carp_softc *);
+static int	carp_clone_create(struct if_clone *, int);
+static int	carp_clone_destroy(struct ifnet *);
+static int	carp_ether_addmulti(struct carp_softc *, struct ifreq *);
+static int

CVS commit: src/sys/netinet

2014-07-30 Thread Ryota Ozaki

Module Name:src
Committed By:   ozaki-r
Date:   Thu Jul 31 00:58:02 UTC 2014

Modified Files:
src/sys/netinet: ip_carp.h

Log Message:
KNF


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/netinet/ip_carp.h

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

Modified files:

Index: src/sys/netinet/ip_carp.h
diff -u src/sys/netinet/ip_carp.h:1.6 src/sys/netinet/ip_carp.h:1.7
--- src/sys/netinet/ip_carp.h:1.6	Wed Sep 16 15:23:05 2009
+++ src/sys/netinet/ip_carp.h	Thu Jul 31 00:58:02 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_carp.h,v 1.6 2009/09/16 15:23:05 pooka Exp $	*/
+/*	$NetBSD: ip_carp.h,v 1.7 2014/07/31 00:58:02 ozaki-r Exp $	*/
 /*	$OpenBSD: ip_carp.h,v 1.18 2005/04/20 23:00:41 mpf Exp $	*/
 
 /*
@@ -153,8 +153,8 @@ struct carpreq {
 
 #ifdef _KERNEL
 void		 carp_init(void);
-void		 carp_ifdetach (struct ifnet *);
-void		 carp_proto_input (struct mbuf *, ...);
+void		 carp_ifdetach(struct ifnet *);
+void		 carp_proto_input(struct mbuf *, ...);
 void		 carp_carpdev_state(void *);
 int		 carp6_proto_input(struct mbuf **, int *, int);
 int		 carp_iamatch(struct in_ifaddr *, u_char *,

CVS commit: src/sys/arch/powerpc/booke

2014-07-30 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Thu Jul 31 01:01:55 UTC 2014

Modified Files:
src/sys/arch/powerpc/booke: trap.c

Log Message:
Don't use numeric constants for SPR.  Use the symbolic name (SPR_PIR).
Add DBSR_BRT to KASSERT


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/powerpc/booke/trap.c

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

Modified files:

Index: src/sys/arch/powerpc/booke/trap.c
diff -u src/sys/arch/powerpc/booke/trap.c:1.24 src/sys/arch/powerpc/booke/trap.c:1.25
--- src/sys/arch/powerpc/booke/trap.c:1.24	Wed Jul 30 23:56:01 2014
+++ src/sys/arch/powerpc/booke/trap.c	Thu Jul 31 01:01:55 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.24 2014/07/30 23:56:01 joerg Exp $	*/
+/*	$NetBSD: trap.c,v 1.25 2014/07/31 01:01:55 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -38,7 +38,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: trap.c,v 1.24 2014/07/30 23:56:01 joerg Exp $);
+__KERNEL_RCSID(1, $NetBSD: trap.c,v 1.25 2014/07/31 01:01:55 matt Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -428,7 +428,9 @@ emulate_opcode(struct trapframe *tf, ksi
 	}
 
 	if (OPC_MFSPR_P(opcode, SPR_PIR)) {
-		__asm (mfspr %0, 286 : =r(tf-tf_fixreg[OPC_MFSPR_REG(opcode)]));
+		__asm (mfspr %0, %1
+		:	=r(tf-tf_fixreg[OPC_MFSPR_REG(opcode)])
+		:	n(SPL_PIR));
 		return true;
 	}
 
@@ -525,7 +527,7 @@ debug_exception(struct trapframe *tf, ks
 	 * Ack the interrupt.
 	 */
 	mtspr(SPR_DBSR, tf-tf_esr);
-	KASSERT(tf-tf_esr  (DBSR_IAC1|DBSR_IAC2));
+	KASSERT(tf-tf_esr  (DBSR_IAC1|DBSR_IAC2|DBSR_BRT));
 	KASSERT((tf-tf_srr1  PSL_SE) == 0);
 
 	/*

CVS commit: src/sys/arch/powerpc/booke

2014-07-30 Thread Matt Thomas

Module Name:src
Committed By:   matt
Date:   Thu Jul 31 01:04:00 UTC 2014

Modified Files:
src/sys/arch/powerpc/booke: trap_subr.S

Log Message:
Use symbolic constant for SPR.  Fix comment.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/powerpc/booke/trap_subr.S

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

Modified files:

Index: src/sys/arch/powerpc/booke/trap_subr.S
diff -u src/sys/arch/powerpc/booke/trap_subr.S:1.9 src/sys/arch/powerpc/booke/trap_subr.S:1.10
--- src/sys/arch/powerpc/booke/trap_subr.S:1.9	Wed Jul 30 23:56:01 2014
+++ src/sys/arch/powerpc/booke/trap_subr.S	Thu Jul 31 01:04:00 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap_subr.S,v 1.9 2014/07/30 23:56:01 joerg Exp $	*/
+/*	$NetBSD: trap_subr.S,v 1.10 2014/07/31 01:04:00 matt Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -34,7 +34,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-RCSID($NetBSD: trap_subr.S,v 1.9 2014/07/30 23:56:01 joerg Exp $)
+RCSID($NetBSD: trap_subr.S,v 1.10 2014/07/31 01:04:00 matt Exp $)
 
 	.globl	_C_LABEL(sctrapexit), _C_LABEL(trapexit), _C_LABEL(intrcall)
 
@@ -858,7 +858,7 @@ _C_LABEL(exception_init):
 	ori	%r5,%r6,_C_LABEL(perfmon_vector)@l
 	mtspr	SPR_IVOR35, %r5
 
-	mfspr	%r5, 286	/* get Process ID register */
+	mfspr	%r5, SPR_PIR	/* get Processor ID register */
 	cmplwi	%r5,0
 	bnelr			/* return if non-0 (non-primary) */

CVS commit: src/sys

2014-07-30 Thread Ryota Ozaki

Module Name:src
Committed By:   ozaki-r
Date:   Thu Jul 31 02:21:51 UTC 2014

Modified Files:
src/sys/net: if.h
src/sys/netinet: raw_ip.c
src/sys/netinet6: raw_ip6.c

Log Message:
Define IFNET_EMPTY() and replace !IFNET_FIRST() with it

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 src/sys/net/if.h
cvs rdiff -u -r1.137 -r1.138 src/sys/netinet/raw_ip.c
cvs rdiff -u -r1.130 -r1.131 src/sys/netinet6/raw_ip6.c

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

Modified files:

Index: src/sys/net/if.h
diff -u src/sys/net/if.h:1.172 src/sys/net/if.h:1.173
--- src/sys/net/if.h:1.172	Wed Jul 16 03:17:26 2014
+++ src/sys/net/if.h	Thu Jul 31 02:21:51 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: if.h,v 1.172 2014/07/16 03:17:26 ozaki-r Exp $	*/
+/*	$NetBSD: if.h,v 1.173 2014/07/31 02:21:51 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -981,6 +981,7 @@ __END_DECLS
 #ifdef _KERNEL
 
 #define	IFNET_FIRST()			TAILQ_FIRST(ifnet_list)
+#define	IFNET_EMPTY()			TAILQ_EMPTY(ifnet_list)
 #define	IFNET_NEXT(__ifp)		TAILQ_NEXT((__ifp), if_list)
 #define	IFNET_FOREACH(__ifp)		TAILQ_FOREACH(__ifp, ifnet_list, if_list)
 #define	IFADDR_FIRST(__ifp)		TAILQ_FIRST((__ifp)-if_addrlist)

Index: src/sys/netinet/raw_ip.c
diff -u src/sys/netinet/raw_ip.c:1.137 src/sys/netinet/raw_ip.c:1.138
--- src/sys/netinet/raw_ip.c:1.137	Wed Jul 30 10:04:26 2014
+++ src/sys/netinet/raw_ip.c	Thu Jul 31 02:21:51 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: raw_ip.c,v 1.137 2014/07/30 10:04:26 rtr Exp $	*/
+/*	$NetBSD: raw_ip.c,v 1.138 2014/07/31 02:21:51 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -65,7 +65,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: raw_ip.c,v 1.137 2014/07/30 10:04:26 rtr Exp $);
+__KERNEL_RCSID(0, $NetBSD: raw_ip.c,v 1.138 2014/07/31 02:21:51 ozaki-r Exp $);
 
 #include opt_inet.h
 #include opt_compat_netbsd.h
@@ -487,7 +487,7 @@ rip_connect_pcb(struct inpcb *inp, struc
 
 	if (nam-m_len != sizeof(*addr))
 		return (EINVAL);
-	if (!IFNET_FIRST())
+	if (IFNET_EMPTY())
 		return (EADDRNOTAVAIL);
 	if (addr-sin_family != AF_INET)
 		return (EAFNOSUPPORT);
@@ -575,7 +575,7 @@ rip_bind(struct socket *so, struct mbuf 
 		error = EINVAL;
 		goto release;
 	}
-	if (!IFNET_FIRST()) {
+	if (IFNET_EMPTY()) {
 		error = EADDRNOTAVAIL;
 		goto release;
 	}

Index: src/sys/netinet6/raw_ip6.c
diff -u src/sys/netinet6/raw_ip6.c:1.130 src/sys/netinet6/raw_ip6.c:1.131
--- src/sys/netinet6/raw_ip6.c:1.130	Wed Jul 30 10:04:26 2014
+++ src/sys/netinet6/raw_ip6.c	Thu Jul 31 02:21:51 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: raw_ip6.c,v 1.130 2014/07/30 10:04:26 rtr Exp $	*/
+/*	$NetBSD: raw_ip6.c,v 1.131 2014/07/31 02:21:51 ozaki-r Exp $	*/
 /*	$KAME: raw_ip6.c,v 1.82 2001/07/23 18:57:56 jinmei Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: raw_ip6.c,v 1.130 2014/07/30 10:04:26 rtr Exp $);
+__KERNEL_RCSID(0, $NetBSD: raw_ip6.c,v 1.131 2014/07/31 02:21:51 ozaki-r Exp $);
 
 #include opt_ipsec.h
 
@@ -667,7 +667,7 @@ rip6_bind(struct socket *so, struct mbuf
 	addr = mtod(nam, struct sockaddr_in6 *);
 	if (nam-m_len != sizeof(*addr))
 		return EINVAL;
-	if (!IFNET_FIRST() || addr-sin6_family != AF_INET6)
+	if (IFNET_EMPTY() || addr-sin6_family != AF_INET6)
 		return EADDRNOTAVAIL;
 
 	if ((error = sa6_embedscope(addr, ip6_use_defzone)) != 0)
@@ -716,7 +716,7 @@ rip6_connect(struct socket *so, struct m
 
 	if (nam-m_len != sizeof(*addr))
 		return EINVAL;
-	if (!IFNET_FIRST())
+	if (IFNET_EMPTY())
 		return EADDRNOTAVAIL;
 	if (addr-sin6_family != AF_INET6)
 		return EAFNOSUPPORT;

CVS commit: src/sys/netinet

2014-07-30 Thread Ryota Ozaki

Module Name:src
Committed By:   ozaki-r
Date:   Thu Jul 31 02:37:25 UTC 2014

Modified Files:
src/sys/netinet: ip_carp.c

Log Message:
Make carp_suppress_preempt global back

It is still accessed by if_pfsync.c.

This unbreaks the build of i386 kernel.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/netinet/ip_carp.c

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

Modified files:

Index: src/sys/netinet/ip_carp.c
diff -u src/sys/netinet/ip_carp.c:1.58 src/sys/netinet/ip_carp.c:1.59
--- src/sys/netinet/ip_carp.c:1.58	Thu Jul 31 00:56:23 2014
+++ src/sys/netinet/ip_carp.c	Thu Jul 31 02:37:25 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_carp.c,v 1.58 2014/07/31 00:56:23 ozaki-r Exp $	*/
+/*	$NetBSD: ip_carp.c,v 1.59 2014/07/31 02:37:25 ozaki-r Exp $	*/
 /*	$OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
 #include opt_mbuftrace.h
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ip_carp.c,v 1.58 2014/07/31 00:56:23 ozaki-r Exp $);
+__KERNEL_RCSID(0, $NetBSD: ip_carp.c,v 1.59 2014/07/31 02:37:25 ozaki-r Exp $);
 
 /*
  * TODO:
@@ -153,7 +153,7 @@ struct carp_softc {
 	LIST_HEAD(__carp_mchead, carp_mc_entry)	carp_mc_listhead;
 };
 
-static int carp_suppress_preempt = 0;
+int carp_suppress_preempt = 0;
 static int carp_opts[CARPCTL_MAXID] = { 0, 1, 0, 0, 0 };	/* XXX for now */
 
 static percpu_t *carpstat_percpu;

CVS commit: src/sys/dev/pci

2014-07-30 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Thu Jul 31 02:54:46 UTC 2014

Modified Files:
src/sys/dev/pci: if_wm.c

Log Message:
 Fix a bug that I added in rev. 1.273. Some old card stopped at the attach
function with Please update the Bootagent message. The code to clear the
SWSM_SMBI bit is only for 8257[1234] and 82580.


To generate a diff of this commit:
cvs rdiff -u -r1.283 -r1.284 src/sys/dev/pci/if_wm.c

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

Modified files:

Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.283 src/sys/dev/pci/if_wm.c:1.284
--- src/sys/dev/pci/if_wm.c:1.283	Mon Jul 28 06:36:09 2014
+++ src/sys/dev/pci/if_wm.c	Thu Jul 31 02:54:46 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.283 2014/07/28 06:36:09 ozaki-r Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.284 2014/07/31 02:54:46 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.283 2014/07/28 06:36:09 ozaki-r Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.284 2014/07/31 02:54:46 msaitoh Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -1746,13 +1746,18 @@ wm_attach(device_t parent, device_t self
 		} else
 			force_clear_smbi = false;
 		break;
-	default:
+	case WM_T_82573:
+	case WM_T_82574:
+	case WM_T_82583:
 		force_clear_smbi = true;
 		break;
+	default:
+		force_clear_smbi = false;
+		break;
 	}
 	if (force_clear_smbi) {
 		reg = CSR_READ(sc, WMREG_SWSM);
-		if ((reg  ~SWSM_SMBI) != 0)
+		if ((reg  SWSM_SMBI) != 0)
 			aprint_error_dev(sc-sc_dev,
 			Please update the Bootagent\n);
 		CSR_WRITE(sc, WMREG_SWSM, reg  ~SWSM_SMBI);

CVS commit: src/sys

2014-07-30 Thread Tyler R. Retzlaff

Module Name:src
Committed By:   rtr
Date:   Thu Jul 31 03:39:36 UTC 2014

Modified Files:
src/sys/dev/bluetooth: bthidev.c btmagic.c btsco.c
src/sys/kern: uipc_socket.c uipc_socket2.c uipc_usrreq.c
src/sys/net: link_proto.c raw_usrreq.c rtsock.c
src/sys/netatalk: ddp_usrreq.c
src/sys/netbt: hci_socket.c l2cap.h l2cap_socket.c l2cap_upper.c
rfcomm.h rfcomm_session.c rfcomm_socket.c rfcomm_upper.c sco.h
sco_socket.c sco_upper.c
src/sys/netinet: raw_ip.c tcp_usrreq.c tcp_var.h udp_usrreq.c
src/sys/netinet6: raw_ip6.c udp6_usrreq.c
src/sys/netipsec: keysock.c
src/sys/netmpls: mpls_proto.c
src/sys/netnatm: natm.c
src/sys/rump/net/lib/libsockin: sockin.c
src/sys/sys: protosw.h un.h

Log Message:
split PRU_DISCONNECT, PRU_SHUTDOWN and PRU_ABORT function out of
pr_generic() usrreq switches and put into separate functions

   xxx_disconnect(struct socket *)
   xxx_shutdown(struct socket *)
   xxx_abort(struct socket *)

   - always KASSERT(solocked(so)) even if not implemented
   - replace calls to pr_generic() with req =
PRU_{DISCONNECT,SHUTDOWN,ABORT}
 with calls to pr_{disconnect,shutdown,abort}() respectively

rename existing internal functions used to implement above functionality
to permit use of the names for xxx_{disconnect,shutdown,abort}().

   - {l2cap,sco,rfcomm}_disconnect() -
{l2cap,sco,rfcomm}_disconnect_pcb()
   - {unp,rip,tcp}_disconnect() - {unp,rip,tcp}_disconnect1()
   - unp_shutdown() - unp_shutdown1()

patch reviewed by rmind


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/bluetooth/bthidev.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/bluetooth/btmagic.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/bluetooth/btsco.c
cvs rdiff -u -r1.228 -r1.229 src/sys/kern/uipc_socket.c
cvs rdiff -u -r1.119 -r1.120 src/sys/kern/uipc_socket2.c
cvs rdiff -u -r1.162 -r1.163 src/sys/kern/uipc_usrreq.c
cvs rdiff -u -r1.18 -r1.19 src/sys/net/link_proto.c
cvs rdiff -u -r1.46 -r1.47 src/sys/net/raw_usrreq.c
cvs rdiff -u -r1.158 -r1.159 src/sys/net/rtsock.c
cvs rdiff -u -r1.56 -r1.57 src/sys/netatalk/ddp_usrreq.c
cvs rdiff -u -r1.35 -r1.36 src/sys/netbt/hci_socket.c
cvs rdiff -u -r1.16 -r1.17 src/sys/netbt/l2cap.h src/sys/netbt/l2cap_upper.c
cvs rdiff -u -r1.26 -r1.27 src/sys/netbt/l2cap_socket.c
cvs rdiff -u -r1.15 -r1.16 src/sys/netbt/rfcomm.h
cvs rdiff -u -r1.21 -r1.22 src/sys/netbt/rfcomm_session.c
cvs rdiff -u -r1.27 -r1.28 src/sys/netbt/rfcomm_socket.c
cvs rdiff -u -r1.18 -r1.19 src/sys/netbt/rfcomm_upper.c
cvs rdiff -u -r1.9 -r1.10 src/sys/netbt/sco.h
cvs rdiff -u -r1.28 -r1.29 src/sys/netbt/sco_socket.c
cvs rdiff -u -r1.14 -r1.15 src/sys/netbt/sco_upper.c
cvs rdiff -u -r1.138 -r1.139 src/sys/netinet/raw_ip.c
cvs rdiff -u -r1.193 -r1.194 src/sys/netinet/tcp_usrreq.c
cvs rdiff -u -r1.174 -r1.175 src/sys/netinet/tcp_var.h
cvs rdiff -u -r1.211 -r1.212 src/sys/netinet/udp_usrreq.c
cvs rdiff -u -r1.131 -r1.132 src/sys/netinet6/raw_ip6.c
cvs rdiff -u -r1.110 -r1.111 src/sys/netinet6/udp6_usrreq.c
cvs rdiff -u -r1.38 -r1.39 src/sys/netipsec/keysock.c
cvs rdiff -u -r1.18 -r1.19 src/sys/netmpls/mpls_proto.c
cvs rdiff -u -r1.40 -r1.41 src/sys/netnatm/natm.c
cvs rdiff -u -r1.53 -r1.54 src/sys/rump/net/lib/libsockin/sockin.c
cvs rdiff -u -r1.55 -r1.56 src/sys/sys/protosw.h
cvs rdiff -u -r1.50 -r1.51 src/sys/sys/un.h

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

Modified files:

Index: src/sys/dev/bluetooth/bthidev.c
diff -u src/sys/dev/bluetooth/bthidev.c:1.27 src/sys/dev/bluetooth/bthidev.c:1.28
--- src/sys/dev/bluetooth/bthidev.c:1.27	Wed Jul 30 10:04:25 2014
+++ src/sys/dev/bluetooth/bthidev.c	Thu Jul 31 03:39:35 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: bthidev.c,v 1.27 2014/07/30 10:04:25 rtr Exp $	*/
+/*	$NetBSD: bthidev.c,v 1.28 2014/07/31 03:39:35 rtr Exp $	*/
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bthidev.c,v 1.27 2014/07/30 10:04:25 rtr Exp $);
+__KERNEL_RCSID(0, $NetBSD: bthidev.c,v 1.28 2014/07/31 03:39:35 rtr Exp $);
 
 #include sys/param.h
 #include sys/condvar.h
@@ -370,14 +370,14 @@ bthidev_detach(device_t self, int flags)
 
 	/* close interrupt channel */
 	if (sc-sc_int != NULL) {
-		l2cap_disconnect(sc-sc_int, 0);
+		l2cap_disconnect_pcb(sc-sc_int, 0);
 		l2cap_detach_pcb(sc-sc_int);
 		sc-sc_int = NULL;
 	}
 
 	/* close control channel */
 	if (sc-sc_ctl != NULL) {
-		l2cap_disconnect(sc-sc_ctl, 0);
+		l2cap_disconnect_pcb(sc-sc_ctl, 0);
 		l2cap_detach_pcb(sc-sc_ctl);
 		sc-sc_ctl = NULL;
 	}
@@ -450,12 +450,12 @@ bthidev_timeout(void *arg)
 	switch (sc-sc_state) {
 	case BTHID_CLOSED:
 		if (sc-sc_int != NULL) {
-			l2cap_disconnect(sc-sc_int, 0);
+			l2cap_disconnect_pcb(sc-sc_int, 0);
 			break;
 		}
 
 		if (sc-sc_ctl != NULL) {
-			l2cap_disconnect(sc-sc_ctl, 0);
+			l2cap_disconnect_pcb(sc-sc_ctl, 0);

CVS commit: src/sys/dev/pci

2014-07-30 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Thu Jul 31 03:50:09 UTC 2014

Modified Files:
src/sys/dev/pci: if_wm.c if_wmreg.h

Log Message:
 Fix fiber link problem (PR#44776 and PR#30880). Tested with 82543GC, 82544EI,
82545EM, 82546GB 82571EB and 82572EI fiber cards.
- Don't use the RXCFG interrupt. It's not required and the interrupt is very
  heavy (a lot of interrupts). Same as {Free,Open}BSD.
- Modify wm_tbi_mediachange() to be close to em_setup_fiber_serdes_link()
  of {Free,Open}BSD. At least, don't forget to set duplex setting.
- WM_T_82545 is not 1000base-SX but 1000base-LX. Same as FreeBSD. Tested with
  my own 82545EM card.


To generate a diff of this commit:
cvs rdiff -u -r1.284 -r1.285 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/pci/if_wmreg.h

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

Modified files:

Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.284 src/sys/dev/pci/if_wm.c:1.285
--- src/sys/dev/pci/if_wm.c:1.284	Thu Jul 31 02:54:46 2014
+++ src/sys/dev/pci/if_wm.c	Thu Jul 31 03:50:09 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.284 2014/07/31 02:54:46 msaitoh Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.285 2014/07/31 03:50:09 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.284 2014/07/31 02:54:46 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.285 2014/07/31 03:50:09 msaitoh Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -375,8 +375,6 @@ struct wm_softc {
 	int sc_tbi_linkup;		/* TBI link status */
 	int sc_tbi_anegticks;		/* autonegotiation ticks */
 	int sc_tbi_ticks;		/* tbi ticks */
-	int sc_tbi_nrxcfg;		/* count of ICR_RXCFG */
-	int sc_tbi_lastnrxcfg;		/* count of ICR_RXCFG (on last tick) */
 
 	int sc_mchash_type;		/* multicast filter offset */
 
@@ -3853,15 +3851,10 @@ wm_init_locked(struct ifnet *ifp)
 		reg |= RXCSUM_IPV6OFL | RXCSUM_TUOFL;
 	CSR_WRITE(sc, WMREG_RXCSUM, reg);
 
-	/* Reset TBI's RXCFG count */
-	sc-sc_tbi_nrxcfg = sc-sc_tbi_lastnrxcfg = 0;
-
 	/* Set up the interrupt registers. */
 	CSR_WRITE(sc, WMREG_IMC, 0xU);
 	sc-sc_icr = ICR_TXDW | ICR_LSC | ICR_RXSEQ | ICR_RXDMT0 |
 	ICR_RXO | ICR_RXT0;
-	if ((sc-sc_flags  WM_F_HAS_MII) == 0)
-		sc-sc_icr |= ICR_RXCFG;
 	CSR_WRITE(sc, WMREG_IMS, sc-sc_icr);
 
 	if ((sc-sc_type == WM_T_ICH8) || (sc-sc_type == WM_T_ICH9)
@@ -5658,11 +5651,6 @@ wm_linkintr_tbi(struct wm_softc *sc, uin
 			sc-sc_tbi_linkup = 0;
 		}
 		wm_tbi_set_linkled(sc);
-	} else if (icr  ICR_RXCFG) {
-		DPRINTF(WM_DEBUG_LINK, (%s: LINK: receiving /C/\n,
-		device_xname(sc-sc_dev)));
-		sc-sc_tbi_nrxcfg++;
-		wm_check_for_link(sc);
 	} else if (icr  ICR_RXSEQ) {
 		DPRINTF(WM_DEBUG_LINK,
 		(%s: LINK: Receive sequence error\n,
@@ -5737,7 +5725,7 @@ wm_intr(void *arg)
 #endif
 		wm_txintr(sc);
 
-		if (icr  (ICR_LSC|ICR_RXSEQ|ICR_RXCFG)) {
+		if (icr  (ICR_LSC|ICR_RXSEQ)) {
 			WM_EVCNT_INCR(sc-sc_ev_linkintr);
 			wm_linkintr(sc, icr);
 		}
@@ -7262,8 +7250,15 @@ do {	\
 } while (/*CONSTCOND*/0)
 
 	aprint_normal_dev(sc-sc_dev, );
-	ADD(1000baseSX, IFM_1000_SX, ANAR_X_HD);
-	ADD(1000baseSX-FDX, IFM_1000_SX|IFM_FDX, ANAR_X_FD);
+
+	/* Only 82545 is LX */
+	if (sc-sc_type == WM_T_82545) {
+		ADD(1000baseLX, IFM_1000_LX, ANAR_X_HD);
+		ADD(1000baseLX-FDX, IFM_1000_LX|IFM_FDX, ANAR_X_FD);
+	} else {
+		ADD(1000baseSX, IFM_1000_SX, ANAR_X_HD);
+		ADD(1000baseSX-FDX, IFM_1000_SX|IFM_FDX, ANAR_X_FD);
+	}
 	ADD(auto, IFM_AUTO, ANAR_X_FD|ANAR_X_HD);
 	aprint_normal(\n);
 
@@ -7293,7 +7288,11 @@ wm_tbi_mediastatus(struct ifnet *ifp, st
 	}
 
 	ifmr-ifm_status |= IFM_ACTIVE;
-	ifmr-ifm_active |= IFM_1000_SX;
+	/* Only 82545 is LX */
+	if (sc-sc_type == WM_T_82545)
+		ifmr-ifm_active |= IFM_1000_LX;
+	else
+		ifmr-ifm_active |= IFM_1000_SX;
 	if (CSR_READ(sc, WMREG_STATUS)  STATUS_FD)
 		ifmr-ifm_active |= IFM_FDX;
 	else
@@ -7321,30 +7320,30 @@ wm_tbi_mediachange(struct ifnet *ifp)
 	if (sc-sc_wmp-wmp_flags  WMP_F_SERDES)
 		return 0;
 
-	sc-sc_txcw = 0;
-	if (IFM_SUBTYPE(ife-ifm_media) == IFM_AUTO ||
-	(sc-sc_mii.mii_media.ifm_media  IFM_FLOW) != 0)
+	if ((sc-sc_type == WM_T_82571) || (sc-sc_type == WM_T_82572)
+	|| (sc-sc_type = WM_T_82575))
+		CSR_WRITE(sc, WMREG_SCTL, SCTL_DISABLE_SERDES_LOOPBACK);
+
+	/* XXX power_up_serdes_link_82575() */
+
+	sc-sc_ctrl = ~CTRL_LRST;
+	sc-sc_txcw = TXCW_ANE;
+	if (IFM_SUBTYPE(ife-ifm_media) == IFM_AUTO)
+		sc-sc_txcw |= TXCW_FD | TXCW_HD;
+	else if (ife-ifm_media  IFM_FDX)
+		sc-sc_txcw |= TXCW_FD;
+	else
+		sc-sc_txcw |= TXCW_HD;
+
+	if ((sc-sc_mii.mii_media.ifm_media  IFM_FLOW) != 0)
 		sc-sc_txcw |= TXCW_SYM_PAUSE | TXCW_ASYM_PAUSE;
-	if (IFM_SUBTYPE(ife-ifm_media) == IFM_AUTO) {
-		sc-sc_txcw |= TXCW_ANE;
-	} else {
-		/*
-		 * If autonegotiation is turned off, force link up and turn on
-		 * full duplex
-		 */
-		sc-sc_txcw =

CVS commit: src/sys/net

2014-07-30 Thread Tyler R. Retzlaff

Module Name:src
Committed By:   rtr
Date:   Thu Jul 31 05:13:53 UTC 2014

Modified Files:
src/sys/net: raw_usrreq.c

Log Message:
fix missed conversion to call to pr_connect() from pr_generic() when
PRU_CONNECT split was done.

-   error = (*so-so_proto-pr_usrreqs-pr_generic)(so,
-   PRU_CONNECT, NULL, nam, NULL, l);
+   error = (*so-so_proto-pr_usrreqs-pr_connect)(so, 
nam);

without this change KASSERT() would be triggered if raw send needs to
perform a connect.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/net/raw_usrreq.c

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

Modified files:

Index: src/sys/net/raw_usrreq.c
diff -u src/sys/net/raw_usrreq.c:1.47 src/sys/net/raw_usrreq.c:1.48
--- src/sys/net/raw_usrreq.c:1.47	Thu Jul 31 03:39:35 2014
+++ src/sys/net/raw_usrreq.c	Thu Jul 31 05:13:53 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: raw_usrreq.c,v 1.47 2014/07/31 03:39:35 rtr Exp $	*/
+/*	$NetBSD: raw_usrreq.c,v 1.48 2014/07/31 05:13:53 rtr Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -36,7 +36,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: raw_usrreq.c,v 1.47 2014/07/31 03:39:35 rtr Exp $);
+__KERNEL_RCSID(0, $NetBSD: raw_usrreq.c,v 1.48 2014/07/31 05:13:53 rtr Exp $);
 
 #include sys/param.h
 #include sys/mbuf.h
@@ -216,8 +216,7 @@ raw_usrreq(struct socket *so, int req, s
 error = EISCONN;
 goto die;
 			}
-			error = (*so-so_proto-pr_usrreqs-pr_generic)(so,
-			PRU_CONNECT, NULL, nam, NULL, l);
+			error = (*so-so_proto-pr_usrreqs-pr_connect)(so, nam);
 			if (error) {
 			die:
 m_freem(m);

CVS commit: src/sys/netmpls

2014-07-30 Thread Tyler R. Retzlaff

Module Name:src
Committed By:   rtr
Date:   Thu Jul 31 05:37:00 UTC 2014

Modified Files:
src/sys/netmpls: mpls_proto.c

Log Message:
add missing KASSERT(req != PRU_XXX) to mpls_usrreq() for PRUs that have
already been split.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/netmpls/mpls_proto.c

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

Modified files:

Index: src/sys/netmpls/mpls_proto.c
diff -u src/sys/netmpls/mpls_proto.c:1.19 src/sys/netmpls/mpls_proto.c:1.20
--- src/sys/netmpls/mpls_proto.c:1.19	Thu Jul 31 03:39:35 2014
+++ src/sys/netmpls/mpls_proto.c	Thu Jul 31 05:37:00 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: mpls_proto.c,v 1.19 2014/07/31 03:39:35 rtr Exp $ */
+/*	$NetBSD: mpls_proto.c,v 1.20 2014/07/31 05:37:00 rtr Exp $ */
 
 /*
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mpls_proto.c,v 1.19 2014/07/31 03:39:35 rtr Exp $);
+__KERNEL_RCSID(0, $NetBSD: mpls_proto.c,v 1.20 2014/07/31 05:37:00 rtr Exp $);
 
 #include opt_inet.h
 #include opt_mbuftrace.h
@@ -200,6 +200,23 @@ static int
 mpls_usrreq(struct socket *so, int req, struct mbuf *m,
 struct mbuf *nam, struct mbuf *control, struct lwp *l)
 {
+
+	KASSERT(req != PRU_ATTACH);
+	KASSERT(req != PRU_DETACH);
+	KASSERT(req != PRU_ACCEPT);
+	KASSERT(req != PRU_BIND);
+	KASSERT(req != PRU_LISTEN);
+	KASSERT(req != PRU_CONNECT);
+	KASSERT(req != PRU_DISCONNECT);
+	KASSERT(req != PRU_SHUTDOWN);
+	KASSERT(req != PRU_ABORT);
+	KASSERT(req != PRU_CONTROL);
+	KASSERT(req != PRU_SENSE);
+	KASSERT(req != PRU_PEERADDR);
+	KASSERT(req != PRU_SOCKADDR);
+	KASSERT(req != PRU_RCVOOB);
+	KASSERT(req != PRU_SENDOOB);
+
 	return EOPNOTSUPP;
 }

CVS commit: src/sys/netinet

CVS commit: src/sys/arch/arm/arm

CVS commit: src/sys/kern

CVS commit: src/sys

CVS commit: src/sys/arch/powerpc/booke/pci

CVS commit: src/sys/dev/pci

CVS commit: src/sys/arch/arm/omap

CVS commit: src/sys/arch/arm/arm

CVS commit: src/sys

CVS commit: src/sys/arch/sparc64/sparc64

CVS import: src/external/bsd/dhcpcd/dist

CVS commit: src/external/bsd/dhcpcd/dist

CVS commit: src/sys/arch/evbppc/walnut

CVS commit: src/sys/arch/arm/arm

CVS commit: src/sys/arch

CVS commit: src/sys/arch

CVS commit: src/sys/arch/powerpc/powerpc

CVS commit: src/sys/arch/powerpc/booke

CVS commit: src/sys/netinet

CVS commit: src/sys/netinet

CVS commit: src/sys/arch/powerpc/booke

CVS commit: src/sys/arch/powerpc/booke

CVS commit: src/sys

CVS commit: src/sys/netinet

CVS commit: src/sys/dev/pci

CVS commit: src/sys

CVS commit: src/sys/dev/pci

CVS commit: src/sys/net

CVS commit: src/sys/netmpls

29 matches

Site Navigation

Mail list logo

Footer information