From owner-svn-src-stable@FreeBSD.ORG  Thu Nov 10 19:10:54 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 427A3106566B;
	Thu, 10 Nov 2011 19:10:54 +0000 (UTC)
	(envelope-from andre@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 31D0E8FC15;
	Thu, 10 Nov 2011 19:10:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAAJAsYJ052223;
	Thu, 10 Nov 2011 19:10:54 GMT (envelope-from andre@svn.freebsd.org)
Received: (from andre@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAAJAsWq052221;
	Thu, 10 Nov 2011 19:10:54 GMT (envelope-from andre@svn.freebsd.org)
Message-Id: <201111101910.pAAJAsWq052221@svn.freebsd.org>
From: Andre Oppermann <andre@FreeBSD.org>
Date: Thu, 10 Nov 2011 19:10:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227423 - stable/9/sys/netinet
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Nov 2011 19:10:54 -0000

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);