From owner-svn-src-head@FreeBSD.ORG  Tue Oct 14 14:51:28 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 865AA5F0;
 Tue, 14 Oct 2014 14:51:28 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7343D8B1;
 Tue, 14 Oct 2014 14:51:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9EEpS3E075152;
 Tue, 14 Oct 2014 14:51:28 GMT (envelope-from ae@FreeBSD.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9EEpSWn075151;
 Tue, 14 Oct 2014 14:51:28 GMT (envelope-from ae@FreeBSD.org)
Message-Id: <201410141451.s9EEpSWn075151@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ae set sender to ae@FreeBSD.org
 using -f
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Tue, 14 Oct 2014 14:51:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r273091 - head/sys/net
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
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/options/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: Tue, 14 Oct 2014 14:51:28 -0000

Author: ae
Date: Tue Oct 14 14:51:27 2014
New Revision: 273091
URL: https://svnweb.freebsd.org/changeset/base/273091

Log:
  Add more ifdefs. SIOC*_IN6 are defined only with INET6.
  
  MFC after:	1 month
  Reported  by:	bz

Modified:
  head/sys/net/if_gif.c

Modified: head/sys/net/if_gif.c
==============================================================================
--- head/sys/net/if_gif.c	Tue Oct 14 14:41:06 2014	(r273090)
+++ head/sys/net/if_gif.c	Tue Oct 14 14:51:27 2014	(r273091)
@@ -744,7 +744,9 @@ gif_ioctl(struct ifnet *ifp, u_long cmd,
 	error = 0;
 	switch (cmd) {
 	case SIOCSIFPHYADDR:
+#ifdef INET6
 	case SIOCSIFPHYADDR_IN6:
+#endif
 		error = EINVAL;
 		switch (cmd) {
 #ifdef INET
@@ -840,8 +842,10 @@ gif_ioctl(struct ifnet *ifp, u_long cmd,
 		break;
 	case SIOCGIFPSRCADDR:
 	case SIOCGIFPDSTADDR:
+#ifdef INET6
 	case SIOCGIFPSRCADDR_IN6:
 	case SIOCGIFPDSTADDR_IN6:
+#endif
 		if (sc->gif_family == 0) {
 			error = EADDRNOTAVAIL;
 			break;
@@ -1057,7 +1061,9 @@ gif_set_tunnel(struct ifnet *ifp, struct
 	sc->gif_family = src->sa_family;
 	sc->gif_hdr = hdr;
 	GIF_WUNLOCK(sc);
+#if defined(INET) || defined(INET6)
 bad:
+#endif
 	if (error == 0 && sc->gif_family != 0)
 		ifp->if_drv_flags |= IFF_DRV_RUNNING;
 	else