From owner-svn-src-user@FreeBSD.ORG Tue Dec 30 05:35:28 2008 Return-Path: <owner-svn-src-user@FreeBSD.ORG> Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 27DC01065670; Tue, 30 Dec 2008 05:35:28 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 159828FC12; Tue, 30 Dec 2008 05:35:28 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBU5ZRGj078271; Tue, 30 Dec 2008 05:35:27 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBU5ZRd6078270; Tue, 30 Dec 2008 05:35:27 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200812300535.mBU5ZRd6078270@svn.freebsd.org> From: Kip Macy <kmacy@FreeBSD.org> Date: Tue, 30 Dec 2008 05:35:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r186592 - user/kmacy/HEAD_fast_net/sys/netinet X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" <svn-src-user.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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, 30 Dec 2008 05:35:28 -0000 Author: kmacy Date: Tue Dec 30 05:35:27 2008 New Revision: 186592 URL: http://svn.freebsd.org/changeset/base/186592 Log: so isn't set yet, reference inp_socket Modified: user/kmacy/HEAD_fast_net/sys/netinet/tcp_input.c Modified: user/kmacy/HEAD_fast_net/sys/netinet/tcp_input.c ============================================================================== --- user/kmacy/HEAD_fast_net/sys/netinet/tcp_input.c Tue Dec 30 05:29:43 2008 (r186591) +++ user/kmacy/HEAD_fast_net/sys/netinet/tcp_input.c Tue Dec 30 05:35:27 2008 (r186592) @@ -586,8 +586,9 @@ findpcb: } INP_WLOCK(inp); if (!(inp->inp_flags & INP_HW_FLOWID) - && (m->m_flags & M_FLOWID) && - ((so == NULL) || !(so->so_options & SO_ACCEPTCONN))) { + && (m->m_flags & M_FLOWID) + && ((inp->inp_socket == NULL) + || !(inp->inp_socket->so_options & SO_ACCEPTCONN))) { inp->inp_flags |= INP_HW_FLOWID; inp->inp_flags &= ~INP_SW_FLOWID; inp->inp_flowid = m->m_pkthdr.flowid;