From owner-svn-src-user@FreeBSD.ORG  Sun Jul 12 21:48:06 2009
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 88771106566C;
	Sun, 12 Jul 2009 21:48:06 +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 779F88FC35;
	Sun, 12 Jul 2009 21:48:06 +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 n6CLm6Lp095949;
	Sun, 12 Jul 2009 21:48:06 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6CLm6lG095947;
	Sun, 12 Jul 2009 21:48:06 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200907122148.n6CLm6lG095947@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Sun, 12 Jul 2009 21:48:06 +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: r195646 - user/kmacy/head_ppacket/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: Sun, 12 Jul 2009 21:48:06 -0000

Author: kmacy
Date: Sun Jul 12 21:48:06 2009
New Revision: 195646
URL: http://svn.freebsd.org/changeset/base/195646

Log:
  fix GRE2IFP macro

Modified:
  user/kmacy/head_ppacket/sys/net/if_gre.h

Modified: user/kmacy/head_ppacket/sys/net/if_gre.h
==============================================================================
--- user/kmacy/head_ppacket/sys/net/if_gre.h	Sun Jul 12 20:17:31 2009	(r195645)
+++ user/kmacy/head_ppacket/sys/net/if_gre.h	Sun Jul 12 21:48:06 2009	(r195646)
@@ -58,9 +58,9 @@ typedef enum {
  * The binary contract is to have the ifp at the front of the softc
  *
  */
-#define	GRE2IFP(sc)	(*(struct ifnet **)(&sc))
+#define	GRE2IFP(sc)	(((struct gre_softc_external *)(sc))->g_ifp)
 struct gre_softc_external {
-	struct ifnet *gre_ifp;
+	struct ifnet *g_ifp;
 	struct in_addr g_src;	/* source address of gre packets */
 	struct in_addr g_dst;	/* destination address of gre packets */
 	u_char g_proto;		/* protocol of encapsulator */