svn commit: r186592 - user/kmacy/HEAD_fast_net/sys/netinet

[Kip Macy]

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;