[Midnightbsd-cvs] src [7843] trunk/sys/netinet/tcp_input.c: temporarily revert tcp input changes.

[laffer1 at midnightbsd.org]

Revision: 7843
          http://svnweb.midnightbsd.org/src/?rev=7843
Author:   laffer1
Date:     2016-09-07 12:54:27 -0400 (Wed, 07 Sep 2016)
Log Message:
-----------
temporarily revert tcp input changes.

Modified Paths:
--------------
    trunk/sys/netinet/tcp_input.c

Modified: trunk/sys/netinet/tcp_input.c
===================================================================
--- trunk/sys/netinet/tcp_input.c	2016-09-07 01:50:12 UTC (rev 7842)
+++ trunk/sys/netinet/tcp_input.c	2016-09-07 16:54:27 UTC (rev 7843)
@@ -581,7 +581,9 @@
 	uint8_t sig_checked = 0;
 #endif
 	uint8_t iptos = 0;
-	struct m_tag *fwd_tag = NULL;
+#ifdef IPFIREWALL_FORWARD
+	struct m_tag *fwd_tag;
+#endif
 #ifdef INET6
 	struct ip6_hdr *ip6 = NULL;
 	int isipv6;
@@ -829,8 +831,6 @@
 		}
 		/* Remove the tag from the packet.  We don't need it anymore. */
 		m_tag_delete(m, fwd_tag);
-		m->m_flags &= ~M_IP6_NEXTHOP;
-		fwd_tag = NULL;
 	} else
 #endif /* IPFIREWALL_FORWARD */
 	if (isipv6) {
@@ -870,8 +870,6 @@
 		}
 		/* Remove the tag from the packet.  We don't need it anymore. */
 		m_tag_delete(m, fwd_tag);
-		m->m_flags &= ~M_IP_NEXTHOP;
-		fwd_tag = NULL;
 	} else
 #endif /* IPFIREWALL_FORWARD */
 		inp = in_pcblookup_mbuf(&V_tcbinfo, ip->ip_src,