From owner-svn-src-stable-6@FreeBSD.ORG Sun Aug 8 14:13:11 2010 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 040DA106568B; Sun, 8 Aug 2010 14:13:11 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E6A978FC1B; Sun, 8 Aug 2010 14:13:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o78EDAOl087893; Sun, 8 Aug 2010 14:13:10 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o78EDAmp087891; Sun, 8 Aug 2010 14:13:10 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201008081413.o78EDAmp087891@svn.freebsd.org> From: Jilles Tjoelker Date: Sun, 8 Aug 2010 14:13:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r211072 - stable/6/etc/rc.d X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Aug 2010 14:13:11 -0000 Author: jilles Date: Sun Aug 8 14:13:10 2010 New Revision: 211072 URL: http://svn.freebsd.org/changeset/base/211072 Log: MFC r210734: Allow starting ipmon if ipnat is enabled but ipfilter is not (in /etc/rc.conf). This fixes an apparent confusion between test(1) and sh(1) syntax for AND/OR. PR: conf/149036 Submitted by: pluknet Modified: stable/6/etc/rc.d/ipmon Directory Properties: stable/6/etc/ (props changed) Modified: stable/6/etc/rc.d/ipmon ============================================================================== --- stable/6/etc/rc.d/ipmon Sun Aug 8 14:00:21 2010 (r211071) +++ stable/6/etc/rc.d/ipmon Sun Aug 8 14:13:10 2010 (r211072) @@ -20,7 +20,7 @@ ipmon_precmd() # Continue only if ipfilter or ipnat is enabled and the # ipfilter module is loaded. # - if ! checkyesno ipfilter_enable -o ! checkyesno ipnat_enable ; then + if ! checkyesno ipfilter_enable && ! checkyesno ipnat_enable ; then err 1 "${name} requires either ipfilter or ipnat enabled" fi if ! sysctl net.inet.ipf.fr_pass >/dev/null 2>&1; then From owner-svn-src-stable-6@FreeBSD.ORG Fri Aug 13 07:34:41 2010 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9DF101065674; Fri, 13 Aug 2010 07:34:41 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8B2228FC0A; Fri, 13 Aug 2010 07:34:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7D7Yfbu034839; Fri, 13 Aug 2010 07:34:41 GMT (envelope-from ume@svn.freebsd.org) Received: (from ume@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7D7Yf3I034838; Fri, 13 Aug 2010 07:34:41 GMT (envelope-from ume@svn.freebsd.org) Message-Id: <201008130734.o7D7Yf3I034838@svn.freebsd.org> From: Hajimu UMEMOTO Date: Fri, 13 Aug 2010 07:34:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r211277 - stable/6/sbin/ip6fw X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Aug 2010 07:34:41 -0000 Author: ume Date: Fri Aug 13 07:34:41 2010 New Revision: 211277 URL: http://svn.freebsd.org/changeset/base/211277 Log: Fix the argument type of fill_icmptypes() on amd64. PR: bin/132911 Submitted by: Yoshitaka AHAREN Modified: stable/6/sbin/ip6fw/ip6fw.c Modified: stable/6/sbin/ip6fw/ip6fw.c ============================================================================== --- stable/6/sbin/ip6fw/ip6fw.c Fri Aug 13 06:39:54 2010 (r211276) +++ stable/6/sbin/ip6fw/ip6fw.c Fri Aug 13 07:34:41 2010 (r211277) @@ -764,7 +764,7 @@ fill_ip6opt(u_char *set, u_char *reset, void fill_icmptypes(types, vp, fw_flg) - u_long *types; + unsigned *types; char **vp; u_short *fw_flg; { From owner-svn-src-stable-6@FreeBSD.ORG Sat Aug 14 13:51:38 2010 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C672D1065696; Sat, 14 Aug 2010 13:51:38 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9B8E48FC14; Sat, 14 Aug 2010 13:51:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7EDpcQ2029195; Sat, 14 Aug 2010 13:51:38 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7EDpcC0029193; Sat, 14 Aug 2010 13:51:38 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <201008141351.o7EDpcC0029193@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Sat, 14 Aug 2010 13:51:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r211298 - stable/6/sys/netinet X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Aug 2010 13:51:39 -0000 Author: bz Date: Sat Aug 14 13:51:38 2010 New Revision: 211298 URL: http://svn.freebsd.org/changeset/base/211298 Log: MFC r210686: MFp4 @181628: Free the rtentry after we diconnected it from the FIB and are counting it as rttrash. There might still be a chance we leak it from a different code path but there is nothing we can do about this here. Modified: stable/6/sys/netinet/in_rmx.c Directory Properties: stable/6/sys/ (props changed) stable/6/sys/contrib/pf/ (props changed) stable/6/sys/dev/cxgb/ (props changed) Modified: stable/6/sys/netinet/in_rmx.c ============================================================================== --- stable/6/sys/netinet/in_rmx.c Sat Aug 14 13:47:34 2010 (r211297) +++ stable/6/sys/netinet/in_rmx.c Sat Aug 14 13:51:38 2010 (r211298) @@ -365,15 +365,35 @@ in_ifadownkill(struct radix_node *rn, vo if (rt->rt_ifa == ap->ifa && (ap->del || !(rt->rt_flags & RTF_STATIC))) { /* + * Aquire a reference so that it can later be freed + * as the refcount would be 0 here in case of at least + * ap->del. + */ + RT_ADDREF(rt); + /* * We need to disable the automatic prune that happens * in this case in rtrequest() because it will blow * away the pointers that rn_walktree() needs in order * continue our descent. We will end up deleting all * the routes that rtrequest() would have in any case, * so that behavior is not needed there. + * Disconnect it from the tree and permit protocols + * to cleanup. */ rt->rt_flags &= ~RTF_CLONING; rtexpunge(rt); + /* + * At this point it is an rttrash node, and in case + * the above is the only reference we must free it. + * If we do not noone will have a pointer and the + * rtentry will be leaked forever. + * In case someone else holds a reference, we are + * fine as we only decrement the refcount. In that + * case if the other entity calls RT_REMREF, we + * will still be leaking but at least we tried. + */ + RTFREE_LOCKED(rt); + return (0); } RT_UNLOCK(rt); return 0; From owner-svn-src-stable-6@FreeBSD.ORG Sat Aug 14 22:49:08 2010 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F3AAA106564A; Sat, 14 Aug 2010 22:49:07 +0000 (UTC) (envelope-from andre@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D52958FC12; Sat, 14 Aug 2010 22:49:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7EMn75N041175; Sat, 14 Aug 2010 22:49:07 GMT (envelope-from andre@svn.freebsd.org) Received: (from andre@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7EMn7hA041173; Sat, 14 Aug 2010 22:49:07 GMT (envelope-from andre@svn.freebsd.org) Message-Id: <201008142249.o7EMn7hA041173@svn.freebsd.org> From: Andre Oppermann Date: Sat, 14 Aug 2010 22:49:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r211321 - stable/6/sys/dev/digi X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Aug 2010 22:49:08 -0000 Author: andre Date: Sat Aug 14 22:49:07 2010 New Revision: 211321 URL: http://svn.freebsd.org/changeset/base/211321 Log: MFC r150132: Increase boot-time DigiBIOS initialization timeout to allow for a larger number of chained port modules. PR: kern/55018 Submitted by: Cyrill Shevchuk Modified: stable/6/sys/dev/digi/digi.c Modified: stable/6/sys/dev/digi/digi.c ============================================================================== --- stable/6/sys/dev/digi/digi.c Sat Aug 14 22:35:20 2010 (r211320) +++ stable/6/sys/dev/digi/digi.c Sat Aug 14 22:49:07 2010 (r211321) @@ -360,7 +360,7 @@ digi_init(struct digi_softc *sc) DLOG(DIGIDB_INIT, (sc->dev, "BIOS started after %d us\n", i)); for (i = 0; vW(ptr) != *(u_short *)"GD"; i++) { - if (i > 2*hz) { + if (i > 5*hz) { log(LOG_ERR, "digi%d: BIOS boot failed " "(0x%02x != 0x%02x)\n", sc->res.unit, vW(ptr), *(u_short *)"GD");