From owner-svn-src-user@FreeBSD.ORG  Tue Nov 27 06:50:25 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 717D3603;
 Tue, 27 Nov 2012 06:50:25 +0000 (UTC) (envelope-from np@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 575CE8FC12;
 Tue, 27 Nov 2012 06:50:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAR6oPj5002403;
 Tue, 27 Nov 2012 06:50:25 GMT (envelope-from np@svn.freebsd.org)
Received: (from np@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAR6oPCb002402;
 Tue, 27 Nov 2012 06:50:25 GMT (envelope-from np@svn.freebsd.org)
Message-Id: <201211270650.qAR6oPCb002402@svn.freebsd.org>
From: Navdeep Parhar <np@FreeBSD.org>
Date: Tue, 27 Nov 2012 06:50:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r243604 - user/np/stable_9_toe/sys/netinet
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Nov 2012 06:50:25 -0000

Author: np
Date: Tue Nov 27 06:50:24 2012
New Revision: 243604
URL: http://svnweb.freebsd.org/changeset/base/243604

Log:
  Pull in r243603:
  
  Make sure that tcp_timer_activate() correctly sees TCP_OFFLOAD (or not).

Modified:
  user/np/stable_9_toe/sys/netinet/tcp_timer.c
Directory Properties:
  user/np/stable_9_toe/sys/   (props changed)

Modified: user/np/stable_9_toe/sys/netinet/tcp_timer.c
==============================================================================
--- user/np/stable_9_toe/sys/netinet/tcp_timer.c	Tue Nov 27 06:42:44 2012	(r243603)
+++ user/np/stable_9_toe/sys/netinet/tcp_timer.c	Tue Nov 27 06:50:24 2012	(r243604)
@@ -32,6 +32,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_tcpdebug.h"