svn commit: r198293 - in stable/8/sys: . amd64/include/xen cddl/contrib/opensolaris contrib/dev/acpica contrib/pf dev/xen/xenpci netinet

[Robert Watson]

Author: rwatson
Date: Tue Oct 20 16:22:31 2009
New Revision: 198293
URL: http://svn.freebsd.org/changeset/base/198293

Log:
  Merge r198196 from head to stable/8:
  
    Rewrap ip_input() comment so that it prints more nicely.
  
  Approved by:	re (kib)

Modified:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/netinet/ip_input.c

Modified: stable/8/sys/netinet/ip_input.c
==============================================================================
--- stable/8/sys/netinet/ip_input.c	Tue Oct 20 15:49:32 2009	(r198292)
+++ stable/8/sys/netinet/ip_input.c	Tue Oct 20 16:22:31 2009	(r198293)
@@ -530,9 +530,9 @@ tooshort:
 	}
 	if ((dchg = (m_tag_find(m, PACKET_TAG_IPFORWARD, NULL) != NULL)) != 0) {
 		/*
-		 * Directly ship on the packet.  This allows to forward packets
-		 * that were destined for us to some other directly connected
-		 * host.
+		 * Directly ship on the packet.  This allows to forward
+		 * packets that were destined for us to some other directly
+		 * connected host.
 		 */
 		ip_forward(m, dchg);
 		return;