svn commit: r227423 - stable/9/sys/netinet

[Andre Oppermann]

Author: andre
Date: Thu Nov 10 19:10:53 2011
New Revision: 227423
URL: http://svn.freebsd.org/changeset/base/227423

Log:
  Back out r226299 (MFC of r226105) which caused a number of ports
  that depend on the incorrect IP length field.  The fix stays in
  HEAD and ports should test for it.
  
  Requested by:	glebius
  Approved by:    re (kib)

Modified:
  stable/9/sys/netinet/raw_ip.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)

Modified: stable/9/sys/netinet/raw_ip.c
==============================================================================
--- stable/9/sys/netinet/raw_ip.c	Thu Nov 10 17:04:33 2011	(r227422)
+++ stable/9/sys/netinet/raw_ip.c	Thu Nov 10 19:10:53 2011	(r227423)
@@ -289,13 +289,6 @@ rip_input(struct mbuf *m, int off)
 	last = NULL;
 
 	ifp = m->m_pkthdr.rcvif;
-	/*
-	 * Add back the IP header length which was
-	 * removed by ip_input().  Raw sockets do
-	 * not modify the packet except for some
-	 * byte order swaps.
-	 */
-	ip->ip_len += off;
 
 	hash = INP_PCBHASH_RAW(proto, ip->ip_src.s_addr,
 	    ip->ip_dst.s_addr, V_ripcbinfo.ipi_hashmask);