svn commit: r300518 - stable/10/sys/netinet

[Luiz Otavio O Souza]

Author: loos
Date: Mon May 23 16:20:50 2016
New Revision: 300518
URL: https://svnweb.freebsd.org/changeset/base/300518

Log:
  MFC r297985:
  
  Do not overwrite the dchg variable.
  
  It does not cause any real issues because the variable is overwritten
  only when the packet is forwarded (and the variable is not used anymore).
  
  Obtained from:	pfSense
  Sponsored by:	Rubicon Communications (Netgate)

Modified:
  stable/10/sys/netinet/ip_input.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netinet/ip_input.c
==============================================================================
--- stable/10/sys/netinet/ip_input.c	Mon May 23 16:19:51 2016	(r300517)
+++ stable/10/sys/netinet/ip_input.c	Mon May 23 16:20:50 2016	(r300518)
@@ -499,8 +499,7 @@ tooshort:
 		goto ours;
 	}
 	if (m->m_flags & M_IP_NEXTHOP) {
-		dchg = (m_tag_find(m, PACKET_TAG_IPFORWARD, NULL) != NULL);
-		if (dchg != 0) {
+		if (m_tag_find(m, PACKET_TAG_IPFORWARD, NULL) != NULL) {
 			/*
 			 * Directly ship the packet on.  This allows
 			 * forwarding packets originally destined to us