From owner-svn-src-projects@FreeBSD.ORG  Fri Jan 16 19:07:13 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@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 D7F39B4;
 Fri, 16 Jan 2015 19:07:13 +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 C40AEB8;
 Fri, 16 Jan 2015 19:07:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0GJ7DPm031354;
 Fri, 16 Jan 2015 19:07:13 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0GJ7DUW031353;
 Fri, 16 Jan 2015 19:07:13 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201501161907.t0GJ7DUW031353@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 16 Jan 2015 19:07:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r277261 - projects/ifnet/sys/netgraph
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jan 2015 19:07:13 -0000

Author: glebius
Date: Fri Jan 16 19:07:13 2015
New Revision: 277261
URL: https://svnweb.freebsd.org/changeset/base/277261

Log:
  Obtain the interface index via SIOCGIFINDEX.  This allows us to
  stop including if_var.h and become 100% opaque ifnet user.
  
  Sponsored by:	Nginx, Inc.

Modified:
  projects/ifnet/sys/netgraph/ng_iface.c

Modified: projects/ifnet/sys/netgraph/ng_iface.c
==============================================================================
--- projects/ifnet/sys/netgraph/ng_iface.c	Fri Jan 16 19:05:15 2015	(r277260)
+++ projects/ifnet/sys/netgraph/ng_iface.c	Fri Jan 16 19:07:13 2015	(r277261)
@@ -71,7 +71,6 @@
 
 #include <net/bpf.h>
 #include <net/if.h>
-#include <net/if_var.h>		/* XXXGL: for if_transmit() and if_index. */
 #include <net/if_types.h>
 #include <net/netisr.h>
 #include <net/route.h>
@@ -555,14 +554,18 @@ ng_iface_rcvmsg(node_p node, item_p item
 		    }
 
 		case NGM_IFACE_GET_IFINDEX:
+		    {
+			struct ifreq ifr;
+
 			NG_MKRESPONSE(resp, msg, sizeof(uint32_t), M_NOWAIT);
 			if (resp == NULL) {
 				error = ENOMEM;
 				break;
 			}
-			*((uint32_t *)resp->data) = ifp->if_index;
+			if_drvioctl(SIOCGIFINDEX, ifp, &ifr, curthread);
+			*((uint32_t *)resp->data) = ifr.ifr_index;
 			break;
-
+		    }
 		default:
 			error = EINVAL;
 			break;