From owner-svn-src-all@FreeBSD.ORG  Tue Jun 12 13:31:33 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1B1091065673;
	Tue, 12 Jun 2012 13:31:33 +0000 (UTC) (envelope-from rrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 064BF8FC16;
	Tue, 12 Jun 2012 13:31:33 +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 q5CDVWh3056002;
	Tue, 12 Jun 2012 13:31:32 GMT (envelope-from rrs@svn.freebsd.org)
Received: (from rrs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5CDVWLk056000;
	Tue, 12 Jun 2012 13:31:32 GMT (envelope-from rrs@svn.freebsd.org)
Message-Id: <201206121331.q5CDVWLk056000@svn.freebsd.org>
From: Randall Stewart <rrs@FreeBSD.org>
Date: Tue, 12 Jun 2012 13:31:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236957 - head/sys/net
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Jun 2012 13:31:33 -0000

Author: rrs
Date: Tue Jun 12 13:31:32 2012
New Revision: 236957
URL: http://svn.freebsd.org/changeset/base/236957

Log:
  Fix comment to better reflect how we are
  cheating and using the csum_data. Also fix
  style issues with the comments.

Modified:
  head/sys/net/if_gif.c

Modified: head/sys/net/if_gif.c
==============================================================================
--- head/sys/net/if_gif.c	Tue Jun 12 13:15:27 2012	(r236956)
+++ head/sys/net/if_gif.c	Tue Jun 12 13:31:32 2012	(r236957)
@@ -385,8 +385,9 @@ keep_going:
 		    m->m_pkthdr.len -= GIF_HDR_LEN6;
 #endif
 #endif
-		/* Now pull back the af in packet that
-		 * was saved in the address location.
+		/* 
+		 * Now pull back the af that we
+		 * stashed in the csum_data.
 		 */
 		af = m->m_pkthdr.csum_data;
 		
@@ -504,9 +505,12 @@ gif_output(ifp, m, dst, ro)
 		dst->sa_family = af;
 	}
 	af = dst->sa_family;
-	/* Now save the af in the inbound pkt csum
-	 * data, this is a cheat since really
-	 * gif tunnels don't do offload.
+	/* 
+	 * Now save the af in the inbound pkt csum
+	 * data, this is a cheat since we are using
+	 * the inbound csum_data field to carry the
+	 * af over to the gif_start() routine, avoiding
+	 * using yet another mtag. 
 	 */
 	m->m_pkthdr.csum_data = af;
 	if (!(ifp->if_flags & IFF_UP) ||
@@ -516,7 +520,8 @@ gif_output(ifp, m, dst, ro)
 		goto end;
 	}
 #ifdef ALTQ
-	/* Make altq aware of the bytes we will add 
+	/*
+	 * Make altq aware of the bytes we will add 
 	 * when we actually send it.
 	 */
 #ifdef INET