From owner-svn-src-user@FreeBSD.ORG  Wed Dec 10 02:21:08 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8DEE11065740;
	Wed, 10 Dec 2008 02:21:08 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7AEEB8FC18;
	Wed, 10 Dec 2008 02:21:08 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBA2L89W009364;
	Wed, 10 Dec 2008 02:21:08 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBA2L8RA009363;
	Wed, 10 Dec 2008 02:21:08 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200812100221.mBA2L8RA009363@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Wed, 10 Dec 2008 02:21:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185823 - user/kmacy/head_arpv2/sys/net
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Dec 2008 02:21:08 -0000

Author: kmacy
Date: Wed Dec 10 02:21:08 2008
New Revision: 185823
URL: http://svn.freebsd.org/changeset/base/185823

Log:
  merge fix for loopback connections

Modified:
  user/kmacy/head_arpv2/sys/net/if_ethersubr.c

Modified: user/kmacy/head_arpv2/sys/net/if_ethersubr.c
==============================================================================
--- user/kmacy/head_arpv2/sys/net/if_ethersubr.c	Wed Dec 10 02:20:58 2008	(r185822)
+++ user/kmacy/head_arpv2/sys/net/if_ethersubr.c	Wed Dec 10 02:21:08 2008	(r185823)
@@ -290,8 +290,16 @@ ether_output(struct ifnet *ifp, struct m
 		senderr(EAFNOSUPPORT);
 	}
 
-	if (lle && (lle->la_flags & LLE_IFADDR) && useloopback)
+	if (lle && (lle->la_flags & LLE_IFADDR) && useloopback) {
+		int csum_flags = 0;
+		if (m->m_pkthdr.csum_flags & CSUM_IP)
+			csum_flags |= (CSUM_IP_CHECKED|CSUM_IP_VALID);
+		if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA)
+			csum_flags |= (CSUM_DATA_VALID|CSUM_PSEUDO_HDR);
+		m->m_pkthdr.csum_flags |= csum_flags;
+		m->m_pkthdr.csum_data = 0xffff;
 		return (if_simloop(ifp, m, dst->sa_family, 0));
+	}
 
 	/*
 	 * Add local net header.  If no space in first mbuf,