From owner-svn-src-releng@FreeBSD.ORG Wed Apr 24 13:19:49 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 04EE9559; Wed, 24 Apr 2013 13:19:49 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E9B3414BD; Wed, 24 Apr 2013 13:19:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3ODJmAT042330; Wed, 24 Apr 2013 13:19:48 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3ODJm8I042329; Wed, 24 Apr 2013 13:19:48 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201304241319.r3ODJm8I042329@svn.freebsd.org> From: Sergey Kandaurov Date: Wed, 24 Apr 2013 13:19:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r249842 - releng/8.4/gnu/usr.bin/groff/tmac X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Apr 2013 13:19:49 -0000 Author: pluknet Date: Wed Apr 24 13:19:48 2013 New Revision: 249842 URL: http://svnweb.freebsd.org/changeset/base/249842 Log: Merge r249836 from stable/8 to releng/8.4: Add FreeBSD 8.4. Approved by: re (kib) Modified: releng/8.4/gnu/usr.bin/groff/tmac/mdoc.local Directory Properties: releng/8.4/gnu/usr.bin/groff/ (props changed) Modified: releng/8.4/gnu/usr.bin/groff/tmac/mdoc.local ============================================================================== --- releng/8.4/gnu/usr.bin/groff/tmac/mdoc.local Wed Apr 24 12:47:41 2013 (r249841) +++ releng/8.4/gnu/usr.bin/groff/tmac/mdoc.local Wed Apr 24 13:19:48 2013 (r249842) @@ -75,6 +75,7 @@ .\" FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-7.4 7.4 .ds doc-operating-system-FreeBSD-8.3 8.3 +.ds doc-operating-system-FreeBSD-8.4 8.4 .ds doc-operating-system-FreeBSD-9.0 9.0 . .\" Definitions not (yet) in doc-syms From owner-svn-src-releng@FreeBSD.ORG Thu Apr 25 21:55:30 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 8DC41312; Thu, 25 Apr 2013 21:55:30 +0000 (UTC) (envelope-from rrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 80B4E1E56; Thu, 25 Apr 2013 21:55:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3PLtTvx051377; Thu, 25 Apr 2013 21:55:30 GMT (envelope-from rrs@svn.freebsd.org) Received: (from rrs@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3PLtT2e051376; Thu, 25 Apr 2013 21:55:29 GMT (envelope-from rrs@svn.freebsd.org) Message-Id: <201304252155.r3PLtT2e051376@svn.freebsd.org> From: Randall Stewart Date: Thu, 25 Apr 2013 21:55:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r249907 - releng/8.4/sys/netinet X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Apr 2013 21:55:30 -0000 Author: rrs Date: Thu Apr 25 21:55:29 2013 New Revision: 249907 URL: http://svnweb.freebsd.org/changeset/base/249907 Log: MFC of r249848: This fixes the issue with the "randomly changing" default route. What it was is there are two places in ip_output.c where we do a goto again. One place was fine, it copies out the new address and then resets dst = ro->rt_dst; But the other place does *not* do that, which means earlier when we found the gateway, we have dst pointing there aka dst = ro->rt_gateway is done.. then we do a goto again.. bam now we clobber the default route. The fix is just to move the again so we are always doing dst = &ro->rt_dst; in the again loop. Approved by: re@freebsd.org (Josh Paetzel) Modified: releng/8.4/sys/netinet/ip_output.c Directory Properties: releng/8.4/sys/ (props changed) releng/8.4/sys/netinet/ (props changed) Modified: releng/8.4/sys/netinet/ip_output.c ============================================================================== --- releng/8.4/sys/netinet/ip_output.c Thu Apr 25 21:19:50 2013 (r249906) +++ releng/8.4/sys/netinet/ip_output.c Thu Apr 25 21:55:29 2013 (r249907) @@ -197,8 +197,8 @@ ip_output(struct mbuf *m, struct mbuf *o hlen = ip->ip_hl << 2; } - dst = (struct sockaddr_in *)&ro->ro_dst; again: + dst = (struct sockaddr_in *)&ro->ro_dst; /* * If there is a cached route, * check that it is to the same destination