From owner-svn-src-head@FreeBSD.ORG  Thu Nov  6 09:41:32 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 11A63106567E;
	Thu,  6 Nov 2008 09:41:32 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 00B9E8FC08;
	Thu,  6 Nov 2008 09:41:32 +0000 (UTC) (envelope-from bz@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 mA69fVsN051031;
	Thu, 6 Nov 2008 09:41:31 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA69fV1U051030;
	Thu, 6 Nov 2008 09:41:31 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200811060941.mA69fV1U051030@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Thu, 6 Nov 2008 09:41:31 +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: r184712 - head/sys/dev/en
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Nov 2008 09:41:32 -0000

Author: bz
Date: Thu Nov  6 09:41:31 2008
New Revision: 184712
URL: http://svn.freebsd.org/changeset/base/184712

Log:
  Hide an unused variable in case we compile with neither INET nor INET6.
  NATM needs 'struct in_addr' to compile, which is a problem on its own
  but include in.h for now if we have NATM but neither INET or INET6.
  
  MFC after:	2 months

Modified:
  head/sys/dev/en/midway.c

Modified: head/sys/dev/en/midway.c
==============================================================================
--- head/sys/dev/en/midway.c	Thu Nov  6 09:27:47 2008	(r184711)
+++ head/sys/dev/en/midway.c	Thu Nov  6 09:41:31 2008	(r184712)
@@ -141,10 +141,12 @@ enum {
 #include <net/if_media.h>
 #include <net/if_atm.h>
 
-#if defined(INET) || defined(INET6)
+#if defined(NATM) || defined(INET) || defined(INET6)
 #include <netinet/in.h>
+#if defined(INET) || defined(INET6)
 #include <netinet/if_atm.h>
 #endif
+#endif
 
 #ifdef NATM
 #include <netnatm/natm.h>
@@ -1524,7 +1526,9 @@ static int
 en_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct en_softc *sc = (struct en_softc *)ifp->if_softc;
+#if defined(INET) || defined(INET6)
 	struct ifaddr *ifa = (struct ifaddr *)data;
+#endif
 	struct ifreq *ifr = (struct ifreq *)data;
 	struct atmio_vcctable *vtab;
 	int error = 0;