Date: Thu, 17 Jul 2008 22:23:12 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 145393 for review Message-ID: <200807172223.m6HMNCOZ042220@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=145393 Change 145393 by sam@sam_ebb on 2008/07/17 22:22:41 IFC @ 145392 Affected files ... .. //depot/projects/vap/bin/stty/print.c#3 integrate .. //depot/projects/vap/etc/rc.d/amd#4 integrate .. //depot/projects/vap/etc/rc.d/apmd#4 integrate .. //depot/projects/vap/etc/rc.d/bsnmpd#3 integrate .. //depot/projects/vap/etc/rc.d/bthidd#3 integrate .. //depot/projects/vap/etc/rc.d/devd#3 integrate .. //depot/projects/vap/etc/rc.d/ftp-proxy#4 integrate .. //depot/projects/vap/etc/rc.d/ftpd#3 integrate .. //depot/projects/vap/etc/rc.d/hcsecd#3 integrate .. //depot/projects/vap/etc/rc.d/idmapd#3 integrate .. //depot/projects/vap/etc/rc.d/keyserv#4 integrate .. //depot/projects/vap/etc/rc.d/lockd#6 integrate .. //depot/projects/vap/etc/rc.d/lpd#4 integrate .. //depot/projects/vap/etc/rc.d/mountd#4 integrate .. //depot/projects/vap/etc/rc.d/moused#5 integrate .. //depot/projects/vap/etc/rc.d/nfsd#4 integrate .. //depot/projects/vap/etc/rc.d/nscd#3 integrate .. //depot/projects/vap/etc/rc.d/ntpd#4 integrate .. //depot/projects/vap/etc/rc.d/powerd#3 integrate .. //depot/projects/vap/etc/rc.d/rpcbind#4 integrate .. //depot/projects/vap/etc/rc.d/rtadvd#4 integrate .. //depot/projects/vap/etc/rc.d/rwho#4 integrate .. //depot/projects/vap/etc/rc.d/sdpd#3 integrate .. //depot/projects/vap/etc/rc.d/sendmail#4 integrate .. //depot/projects/vap/etc/rc.d/sshd#4 integrate .. //depot/projects/vap/etc/rc.d/statd#6 integrate .. //depot/projects/vap/etc/rc.d/timed#4 integrate .. //depot/projects/vap/etc/rc.d/ugidfw#4 integrate .. //depot/projects/vap/etc/rc.d/watchdogd#3 integrate .. //depot/projects/vap/etc/rc.d/ypbind#4 integrate .. //depot/projects/vap/etc/rc.d/yppasswdd#4 integrate .. //depot/projects/vap/etc/rc.d/ypserv#4 integrate .. //depot/projects/vap/etc/rc.d/ypset#3 integrate .. //depot/projects/vap/etc/rc.d/ypupdated#3 integrate .. //depot/projects/vap/etc/rc.d/ypxfrd#3 integrate .. //depot/projects/vap/etc/rc.firewall#6 integrate .. //depot/projects/vap/sys/dev/mxge/if_mxge.c#8 integrate .. //depot/projects/vap/sys/dev/vr/if_vr.c#2 integrate .. //depot/projects/vap/sys/dev/vr/if_vrreg.h#2 integrate .. //depot/projects/vap/sys/kern/kern_exec.c#10 integrate .. //depot/projects/vap/sys/netinet/udp_usrreq.c#10 integrate .. //depot/projects/vap/sys/sys/imgact.h#7 integrate .. //depot/projects/vap/sys/sys/ioctl_compat.h#6 integrate .. //depot/projects/vap/sys/sys/termios.h#4 integrate .. //depot/projects/vap/sys/sys/ttycom.h#6 integrate .. //depot/projects/vap/usr.sbin/pstat/pstat.c#4 integrate .. //depot/projects/vap/usr.sbin/pw/pwupd.c#3 integrate .. //depot/projects/vap/usr.sbin/sysinstall/package.c#3 integrate Differences ... ==== //depot/projects/vap/bin/stty/print.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/stty/print.c,v 1.20 2005/05/26 06:57:57 ache Exp $"); +__FBSDID("$FreeBSD: src/bin/stty/print.c,v 1.21 2008/07/16 11:20:04 ed Exp $"); #include <sys/types.h> @@ -44,8 +44,6 @@ #include "stty.h" #include "extern.h" -#include <sys/ioctl_compat.h> /* XXX NTTYDISC is too well hidden */ - static void binit(const char *); static void bput(const char *); static const char *ccval(struct cchar *, int); @@ -64,9 +62,6 @@ /* Line discipline. */ if (ldisc != TTYDISC) { switch(ldisc) { - case NTTYDISC: - cnt += printf("new tty disc; "); - break; case SLIPDISC: cnt += printf("slip disc; "); break; ==== //depot/projects/vap/etc/rc.d/amd#4 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/amd,v 1.21 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/amd,v 1.22 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: amd # REQUIRE: rpcbind ypbind nfsclient cleanvar ldconfig # BEFORE: DAEMON -# KEYWORD: nojail +# KEYWORD: nojail shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/apmd#4 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/apmd,v 1.13 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/apmd,v 1.14 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: apmd # REQUIRE: DAEMON apm # BEFORE: LOGIN -# KEYWORD: nojail +# KEYWORD: nojail shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/bsnmpd#3 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/bsnmpd,v 1.1 2005/04/17 10:47:58 glebius Exp $ +# $FreeBSD: src/etc/rc.d/bsnmpd,v 1.2 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: bsnmpd # REQUIRE: NETWORKING syslogd -# KEYWORD: nojail +# KEYWORD: nojail shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/bthidd#3 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/bthidd,v 1.1 2006/09/07 22:25:08 emax Exp $ +# $FreeBSD: src/etc/rc.d/bthidd,v 1.2 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: bthidd # REQUIRE: DAEMON hcsecd # BEFORE: LOGIN -# KEYWORD: nojail +# KEYWORD: nojail shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/devd#3 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devd,v 1.10 2006/09/21 14:29:32 brooks Exp $ +# $FreeBSD: src/etc/rc.d/devd,v 1.11 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: devd # REQUIRE: netif network_ipv6 # BEFORE: NETWORKING mountcritremote -# KEYWORD: nojail +# KEYWORD: nojail shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/ftp-proxy#4 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ftp-proxy,v 1.2 2007/12/08 22:27:18 dougb Exp $ +# $FreeBSD: src/etc/rc.d/ftp-proxy,v 1.3 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: ftp-proxy # REQUIRE: DAEMON pf +# KEYWORD: shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/ftpd#3 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ftpd,v 1.1 2006/01/21 18:08:15 yar Exp $ +# $FreeBSD: src/etc/rc.d/ftpd,v 1.2 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: ftpd # REQUIRE: LOGIN cleanvar +# KEYWORD: shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/hcsecd#3 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/hcsecd,v 1.5 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/hcsecd,v 1.6 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: hcsecd # REQUIRE: DAEMON # BEFORE: LOGIN -# KEYWORD: nojail +# KEYWORD: nojail shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/idmapd#3 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/idmapd,v 1.1 2006/10/15 14:19:06 ceri Exp $ +# $FreeBSD: src/etc/rc.d/idmapd,v 1.2 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: idmapd # REQUIRE: rpcbind -# KEYWORD: nojail +# KEYWORD: nojail shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/keyserv#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/keyserv,v 1.4 2007/12/08 22:27:18 dougb Exp $ +# $FreeBSD: src/etc/rc.d/keyserv,v 1.5 2008/07/16 19:50:29 dougb Exp $ # # Start keyserv if we are running Secure RPC @@ -8,6 +8,7 @@ # PROVIDE: keyserv # REQUIRE: ypbind # BEFORE: DAEMON +# KEYWORD: shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/lockd#6 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm -# $FreeBSD: src/etc/rc.d/lockd,v 1.21 2008/06/27 15:45:17 mtm Exp $ +# $FreeBSD: src/etc/rc.d/lockd,v 1.22 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: lockd # REQUIRE: nfsserver nfsclient nfsd rpcbind statd # BEFORE: DAEMON -# KEYWORD: nojail +# KEYWORD: nojail shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/lpd#4 (text+ko) ==== @@ -1,11 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/lpd,v 1.9 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/lpd,v 1.10 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: lpd # REQUIRE: DAEMON # BEFORE: LOGIN +# KEYWORD: shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/mountd#4 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountd,v 1.20 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/mountd,v 1.21 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: mountd # REQUIRE: NETWORKING nfsserver rpcbind quota -# KEYWORD: nojail +# KEYWORD: nojail shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/moused#5 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/moused,v 1.13 2008/06/23 04:46:54 mtm Exp $ +# $FreeBSD: src/etc/rc.d/moused,v 1.14 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: moused # REQUIRE: DAEMON cleanvar -# KEYWORD: nojail +# KEYWORD: nojail shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/nfsd#4 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/nfsd,v 1.14 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/nfsd,v 1.15 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: nfsd # REQUIRE: mountd -# KEYWORD: nojail +# KEYWORD: nojail shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/nscd#3 (text+ko) ==== @@ -1,11 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/nscd,v 1.6 2007/09/28 10:38:08 bushman Exp $ +# $FreeBSD: src/etc/rc.d/nscd,v 1.7 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: nscd # REQUIRE: DAEMON # BEFORE: LOGIN +# KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable nscd: ==== //depot/projects/vap/etc/rc.d/ntpd#4 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ntpd,v 1.14 2008/05/12 11:49:16 flz Exp $ +# $FreeBSD: src/etc/rc.d/ntpd,v 1.15 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: ntpd # REQUIRE: DAEMON ntpdate cleanvar devfs # BEFORE: LOGIN -# KEYWORD: nojail +# KEYWORD: nojail shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/powerd#3 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/powerd,v 1.4 2006/08/27 11:04:39 cperciva Exp $ +# $FreeBSD: src/etc/rc.d/powerd,v 1.5 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: powerd # REQUIRE: DAEMON # BEFORE: LOGIN -# KEYWORD: nojail +# KEYWORD: nojail shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/rpcbind#4 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/rpcbind,v 1.13 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/rpcbind,v 1.14 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: rpcbind # REQUIRE: NETWORKING ntpdate syslogd named +# KEYWORD: shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/rtadvd#4 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/rtadvd,v 1.11 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/rtadvd,v 1.12 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: rtadvd # REQUIRE: DAEMON # BEFORE: LOGIN -# KEYWORD: nojail +# KEYWORD: nojail shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/rwho#4 (text+ko) ==== @@ -1,11 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/rwho,v 1.5 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/rwho,v 1.6 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: rwho # REQUIRE: DAEMON # BEFORE: LOGIN +# KEYWORD: shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/sdpd#3 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/sdpd,v 1.5 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/sdpd,v 1.6 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: sdpd # REQUIRE: DAEMON # BEFORE: LOGIN -# KEYWORD: nojail +# KEYWORD: nojail shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/sendmail#4 (text+ko) ==== @@ -1,12 +1,13 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/sendmail,v 1.18 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/sendmail,v 1.19 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: mail # REQUIRE: LOGIN cleanvar # we make mail start late, so that things like .forward's are not # processed until the system is fully operational +# KEYWORD: shutdown # XXX - Get together with sendmail mantainer to figure out how to # better handle SENDMAIL_ENABLE and 3rd party MTAs. ==== //depot/projects/vap/etc/rc.d/sshd#4 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/sshd,v 1.13 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/sshd,v 1.14 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: sshd # REQUIRE: LOGIN cleanvar +# KEYWORD: shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/statd#6 (text+ko) ==== @@ -1,13 +1,13 @@ #!/bin/sh # # FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm Exp -# $FreeBSD: src/etc/rc.d/statd,v 1.20 2008/06/27 15:45:17 mtm Exp $ +# $FreeBSD: src/etc/rc.d/statd,v 1.21 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: statd # REQUIRE: nfsserver nfsclient nfsd rpcbind # BEFORE: DAEMON -# KEYWORD: nojail +# KEYWORD: nojail shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/timed#4 (text+ko) ==== @@ -1,12 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/timed,v 1.6 2007/12/08 07:20:23 dougb Exp $ +# $FreeBSD: src/etc/rc.d/timed,v 1.7 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: timed # REQUIRE: DAEMON # BEFORE: LOGIN -# KEYWORD: nojail +# KEYWORD: nojail shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/ugidfw#4 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ugidfw,v 1.6 2007/12/08 22:26:30 dougb Exp $ +# $FreeBSD: src/etc/rc.d/ugidfw,v 1.7 2008/07/16 19:50:29 dougb Exp $ # PROVIDE: ugidfw # BEFORE: LOGIN -# KEYWORD: nojail +# KEYWORD: nojail shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/watchdogd#3 (text+ko) ==== @@ -24,12 +24,12 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/watchdogd,v 1.5 2005/01/16 03:12:03 obrien Exp $ +# $FreeBSD: src/etc/rc.d/watchdogd,v 1.6 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: watchdogd # REQUIRE: DAEMON cleanvar -# KEYWORD: nojail +# KEYWORD: nojail shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/ypbind#4 (text+ko) ==== @@ -1,11 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ypbind,v 1.11 2007/12/08 07:20:23 dougb Exp $ +# $FreeBSD: src/etc/rc.d/ypbind,v 1.12 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: ypbind # REQUIRE: ypserv # BEFORE: DAEMON +# KEYWORD: shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/yppasswdd#4 (text+ko) ==== @@ -1,11 +1,12 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/yppasswdd,v 1.12 2007/12/08 07:20:23 dougb Exp $ +# $FreeBSD: src/etc/rc.d/yppasswdd,v 1.13 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: yppasswdd # REQUIRE: ypserv ypbind # BEFORE: LOGIN +# KEYWORD: shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/ypserv#4 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ypserv,v 1.13 2007/12/08 07:20:23 dougb Exp $ +# $FreeBSD: src/etc/rc.d/ypserv,v 1.14 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: ypserv # REQUIRE: rpcbind +# KEYWORD: shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/ypset#3 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ypset,v 1.7 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/ypset,v 1.8 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: ypset # REQUIRE: ypbind +# KEYWORD: shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/ypupdated#3 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ypupdated,v 1.6 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/ypupdated,v 1.7 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: ypupdated # REQUIRE: rpcbind ypserv +# KEYWORD: shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.d/ypxfrd#3 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ypxfrd,v 1.8 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/ypxfrd,v 1.9 2008/07/16 19:50:29 dougb Exp $ # # PROVIDE: ypxfrd # REQUIRE: rpcbind ypserv +# KEYWORD: shutdown . /etc/rc.subr ==== //depot/projects/vap/etc/rc.firewall#6 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.firewall,v 1.55 2008/06/06 07:17:04 keramida Exp $ +# $FreeBSD: src/etc/rc.firewall,v 1.56 2008/07/17 20:00:18 danger Exp $ # # @@ -194,6 +194,7 @@ ${fwcmd} add deny tcp from any to any setup # Allow DNS queries out in the world + ${fwcmd} add pass tcp from me to any 53 setup keep-state ${fwcmd} add pass udp from me to any 53 keep-state # Allow NTP queries out in the world @@ -294,6 +295,7 @@ ${fwcmd} add pass tcp from any to any setup # Allow DNS queries out in the world + ${fwcmd} add pass tcp from ${oip} to any 53 setup keep-state ${fwcmd} add pass udp from ${oip} to any 53 keep-state # Allow NTP queries out in the world ==== //depot/projects/vap/sys/dev/mxge/if_mxge.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ ***************************************************************************/ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.49 2008/04/02 13:59:43 gallatin Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mxge/if_mxge.c,v 1.50 2008/07/17 15:46:35 gallatin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -72,6 +72,7 @@ #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> +#include <dev/pci/pci_private.h> /* XXX for pci_cfg_restore */ #include <vm/vm.h> /* for pmap_mapdev() */ #include <vm/pmap.h> @@ -1348,11 +1349,8 @@ ifp->if_capenable |= IFCAP_LRO; sc->lro_cnt = lro_cnt; if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - callout_stop(&sc->co_hdl); mxge_close(sc); err = mxge_open(sc); - if (err == 0) - callout_reset(&sc->co_hdl, mxge_ticks, mxge_tick, sc); } return err; } @@ -3319,6 +3317,7 @@ } sc->ifp->if_drv_flags |= IFF_DRV_RUNNING; sc->ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; + callout_reset(&sc->co_hdl, mxge_ticks, mxge_tick, sc); return 0; @@ -3335,6 +3334,7 @@ mxge_cmd_t cmd; int err, old_down_cnt; + callout_stop(&sc->co_hdl); sc->ifp->if_drv_flags &= ~IFF_DRV_RUNNING; old_down_cnt = sc->down_cnt; mb(); @@ -3399,9 +3399,10 @@ return (pci_read_config(dev, vs + 0x14, 4)); } -static void +static int mxge_watchdog_reset(mxge_softc_t *sc) { + struct pci_devinfo *dinfo; int err; uint32_t reboot; uint16_t cmd; @@ -3428,7 +3429,7 @@ cmd = pci_read_config(sc->dev, PCIR_COMMAND, 2); if (cmd == 0xffff) { device_printf(sc->dev, "NIC disappeared!\n"); - goto abort; + return (err); } } if ((cmd & PCIM_CMD_BUSMASTEREN) == 0) { @@ -3437,10 +3438,9 @@ device_printf(sc->dev, "NIC rebooted, status = 0x%x\n", reboot); /* restore PCI configuration space */ + dinfo = device_get_ivars(sc->dev); + pci_cfg_restore(sc->dev, dinfo); - /* XXXX waiting for pci_cfg_restore() to be exported */ - goto abort; /* just abort for now */ - /* and redo any changes we made to our config space */ mxge_setup_cfg_space(sc); @@ -3457,22 +3457,15 @@ be32toh(sc->ss->fw_stats->send_done_count)); device_printf(sc->dev, "not resetting\n"); } - -abort: - /* - * stop the watchdog if the nic is dead, to avoid spamming the - * console - */ - if (err != 0) { - callout_stop(&sc->co_hdl); - } + return (err); } -static void +static int mxge_watchdog(mxge_softc_t *sc) { mxge_tx_ring_t *tx = &sc->ss->tx; uint32_t rx_pause = be32toh(sc->ss->fw_stats->dropped_pause); + int err = 0; /* see if we have outstanding transmits, which have been pending for more than mxge_ticks */ @@ -3481,7 +3474,7 @@ tx->done == tx->watchdog_done) { /* check for pause blocking before resetting */ if (tx->watchdog_rx_pause == rx_pause) - mxge_watchdog_reset(sc); + err = mxge_watchdog_reset(sc); else device_printf(sc->dev, "Flow control blocking " "xmits, check link partner\n"); @@ -3493,6 +3486,7 @@ if (sc->need_media_probe) mxge_media_probe(sc); + return (err); } static void @@ -3513,24 +3507,18 @@ mxge_tick(void *arg) { mxge_softc_t *sc = arg; - - - /* Synchronize with possible callout reset/stop. */ - if (callout_pending(&sc->co_hdl) || - !callout_active(&sc->co_hdl)) { - mtx_unlock(&sc->driver_mtx); - return; - } + int err = 0; /* aggregate stats from different slices */ mxge_update_stats(sc); - - callout_reset(&sc->co_hdl, mxge_ticks, mxge_tick, sc); if (!sc->watchdog_countdown) { - mxge_watchdog(sc); + err = mxge_watchdog(sc); sc->watchdog_countdown = 4; } sc->watchdog_countdown--; + if (err == 0) + callout_reset(&sc->co_hdl, mxge_ticks, mxge_tick, sc); + } static int @@ -3554,7 +3542,6 @@ old_mtu = ifp->if_mtu; ifp->if_mtu = mtu; if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - callout_stop(&sc->co_hdl); mxge_close(sc); err = mxge_open(sc); if (err != 0) { @@ -3562,7 +3549,6 @@ mxge_close(sc); (void) mxge_open(sc); } - callout_reset(&sc->co_hdl, mxge_ticks, mxge_tick, sc); } mtx_unlock(&sc->driver_mtx); return err; @@ -3605,8 +3591,6 @@ if (ifp->if_flags & IFF_UP) { if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) { err = mxge_open(sc); - callout_reset(&sc->co_hdl, mxge_ticks, - mxge_tick, sc); } else { /* take care of promis can allmulti flag chages */ @@ -3616,7 +3600,6 @@ } } else { if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - callout_stop(&sc->co_hdl); mxge_close(sc); } } @@ -4313,11 +4296,11 @@ return EBUSY; } mtx_lock(&sc->driver_mtx); - callout_stop(&sc->co_hdl); if (sc->ifp->if_drv_flags & IFF_DRV_RUNNING) mxge_close(sc); mtx_unlock(&sc->driver_mtx); ether_ifdetach(sc->ifp); + callout_drain(&sc->co_hdl); ifmedia_removeall(&sc->media); mxge_dummy_rdma(sc, 0); mxge_rem_sysctls(sc); ==== //depot/projects/vap/sys/dev/vr/if_vr.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/vr/if_vr.c,v 1.130 2008/03/11 04:51:22 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/vr/if_vr.c,v 1.132 2008/07/16 08:35:29 yongari Exp $"); /* * VIA Rhine fast ethernet PCI NIC driver @@ -186,7 +186,8 @@ static void vr_miibus_statchg(device_t); static void vr_link_task(void *, int); -static int vr_setperf(struct vr_softc *, int, uint8_t *); +static void vr_cam_mask(struct vr_softc *, uint32_t, int); +static int vr_cam_data(struct vr_softc *, int, int, uint8_t *); static void vr_set_filter(struct vr_softc *); static void vr_reset(const struct vr_softc *); static int vr_tx_ring_init(struct vr_softc *); @@ -394,27 +395,44 @@ VR_UNLOCK(sc); } -/* - * Copy the address 'mac' into the perfect RX filter entry at - * offset 'idx.' The perfect filter only has 32 entries so do - * some sanity tests. - */ + +static void +vr_cam_mask(struct vr_softc *sc, uint32_t mask, int type) +{ + + if (type == VR_MCAST_CAM) + CSR_WRITE_1(sc, VR_CAMCTL, VR_CAMCTL_ENA | VR_CAMCTL_MCAST); + else + CSR_WRITE_1(sc, VR_CAMCTL, VR_CAMCTL_ENA | VR_CAMCTL_VLAN); + CSR_WRITE_4(sc, VR_CAMMASK, mask); + CSR_WRITE_1(sc, VR_CAMCTL, 0); +} + static int -vr_setperf(struct vr_softc *sc, int idx, uint8_t *mac) +vr_cam_data(struct vr_softc *sc, int type, int idx, uint8_t *mac) { int i; - if (idx < 0 || idx >= VR_CAM_MCAST_CNT || mac == NULL) - return (EINVAL); + if (type == VR_MCAST_CAM) { + if (idx < 0 || idx >= VR_CAM_MCAST_CNT || mac == NULL) + return (EINVAL); + CSR_WRITE_1(sc, VR_CAMCTL, VR_CAMCTL_ENA | VR_CAMCTL_MCAST); + } else + CSR_WRITE_1(sc, VR_CAMCTL, VR_CAMCTL_ENA | VR_CAMCTL_VLAN); /* Set CAM entry address. */ CSR_WRITE_1(sc, VR_CAMADDR, idx); /* Set CAM entry data. */ - for (i = 0; i < ETHER_ADDR_LEN; i++) - CSR_WRITE_1(sc, VR_MAR0 + i, mac[i]); + if (type == VR_MCAST_CAM) { + for (i = 0; i < ETHER_ADDR_LEN; i++) + CSR_WRITE_1(sc, VR_MCAM0 + i, mac[i]); + } else { + CSR_WRITE_1(sc, VR_VCAM0, mac[0]); + CSR_WRITE_1(sc, VR_VCAM1, mac[1]); + } + DELAY(10); /* Write CAM and wait for self-clear of VR_CAMCTL_WRITE bit. */ - CSR_WRITE_1(sc, VR_CAMCTL, - VR_CAMCTL_ENA | VR_CAMCTL_MCAST | VR_CAMCTL_WRITE); + CSR_WRITE_1(sc, VR_CAMCTL, VR_CAMCTL_ENA | VR_CAMCTL_WRITE); for (i = 0; i < VR_TIMEOUT; i++) { DELAY(1); if ((CSR_READ_1(sc, VR_CAMCTL) & VR_CAMCTL_WRITE) == 0) @@ -424,6 +442,7 @@ if (i == VR_TIMEOUT) device_printf(sc->vr_dev, "%s: setting CAM filter timeout!\n", __func__); + CSR_WRITE_1(sc, VR_CAMCTL, 0); return (i == VR_TIMEOUT ? ETIMEDOUT : 0); } @@ -461,6 +480,7 @@ /* Now program new ones. */ error = 0; + mcnt = 0; IF_ADDR_LOCK(ifp); if ((sc->vr_quirks & VR_Q_CAM) != 0) { /* @@ -468,12 +488,10 @@ * 32 entries multicast perfect filter. >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200807172223.m6HMNCOZ042220>