From owner-svn-src-stable-9@FreeBSD.ORG  Sun Jul  1 08:13:21 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8F25B1065673;
	Sun,  1 Jul 2012 08:13:21 +0000 (UTC)
	(envelope-from tuexen@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 79F998FC18;
	Sun,  1 Jul 2012 08:13:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q618DLQK076402;
	Sun, 1 Jul 2012 08:13:21 GMT (envelope-from tuexen@svn.freebsd.org)
Received: (from tuexen@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q618DLhn076400;
	Sun, 1 Jul 2012 08:13:21 GMT (envelope-from tuexen@svn.freebsd.org)
Message-Id: <201207010813.q618DLhn076400@svn.freebsd.org>
From: Michael Tuexen <tuexen@FreeBSD.org>
Date: Sun, 1 Jul 2012 08:13:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237903 - stable/9/sys/netinet
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Jul 2012 08:13:21 -0000

Author: tuexen
Date: Sun Jul  1 08:13:20 2012
New Revision: 237903
URL: http://svn.freebsd.org/changeset/base/237903

Log:
  MFC r236493:
  Honor sysctl for TTL.

Modified:
  stable/9/sys/netinet/sctp_output.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet/sctp_output.c
==============================================================================
--- stable/9/sys/netinet/sctp_output.c	Sun Jul  1 08:11:15 2012	(r237902)
+++ stable/9/sys/netinet/sctp_output.c	Sun Jul  1 08:13:20 2012	(r237903)
@@ -10935,7 +10935,7 @@ sctp_send_shutdown_complete2(struct mbuf
 		iph_out->ip_tos = (u_char)0;
 		iph_out->ip_id = 0;
 		iph_out->ip_off = 0;
-		iph_out->ip_ttl = MAXTTL;
+		iph_out->ip_ttl = MODULE_GLOBAL(ip_defttl);
 		if (port) {
 			iph_out->ip_p = IPPROTO_UDP;
 		} else {
@@ -12004,7 +12004,7 @@ sctp_send_abort(struct mbuf *m, int iphl
 		iph_out->ip_tos = (u_char)0;
 		iph_out->ip_id = 0;
 		iph_out->ip_off = 0;
-		iph_out->ip_ttl = MAXTTL;
+		iph_out->ip_ttl = MODULE_GLOBAL(ip_defttl);
 		if (port) {
 			iph_out->ip_p = IPPROTO_UDP;
 		} else {
@@ -12267,7 +12267,7 @@ sctp_send_operr_to(struct mbuf *m, int i
 		iph_out->ip_tos = (u_char)0;
 		iph_out->ip_id = 0;
 		iph_out->ip_off = 0;
-		iph_out->ip_ttl = MAXTTL;
+		iph_out->ip_ttl = MODULE_GLOBAL(ip_defttl);
 		if (port) {
 			iph_out->ip_p = IPPROTO_UDP;
 		} else {