From b85c030e9ccbc8afe32143967bce4ea68c60dcd9 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <swildner@dragonflybsd.org>
Date: Sat, 15 Sep 2007 23:52:49 +0000
Subject: [PATCH] if_ioctl takes a pointer to struct ucred.

While I'm here change the argument 'command' to 'cmd' for consistency.
---
 sys/netgraph/eiface/ng_eiface.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/sys/netgraph/eiface/ng_eiface.c b/sys/netgraph/eiface/ng_eiface.c
index 1a497400ed..b68edb3d7d 100644
--- a/sys/netgraph/eiface/ng_eiface.c
+++ b/sys/netgraph/eiface/ng_eiface.c
@@ -28,7 +28,7 @@
  *
  * 	$Id: ng_eiface.c,v 1.14 2000/03/15 12:28:44 vitaly Exp $
  * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.4.2.5 2002/12/17 21:47:48 julian Exp $
- * $DragonFly: src/sys/netgraph/eiface/ng_eiface.c,v 1.13 2007/08/01 12:35:29 swildner Exp $
+ * $DragonFly: src/sys/netgraph/eiface/ng_eiface.c,v 1.14 2007/09/15 23:52:49 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -90,7 +90,8 @@ typedef struct ng_eiface_private *priv_p;
 /* Interface methods */
 static void	ng_eiface_init(void *xsc);
 static void	ng_eiface_start(struct ifnet *ifp);
-static int	ng_eiface_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
+static int	ng_eiface_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data,
+				struct ucred *cr);
 #ifdef DEBUG
 static void	ng_eiface_print_ioctl(struct ifnet *ifp, int cmd, caddr_t data);
 #endif
@@ -133,20 +134,20 @@ static int ng_eiface_next_unit;
  * Process an ioctl for the virtual interface
  */
 static int
-ng_eiface_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
+ng_eiface_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data, struct ucred *cr)
 {
 	struct ifreq *const ifr = (struct ifreq *) data;
 	int error = 0;
 
 #ifdef DEBUG
-	ng_eiface_print_ioctl(ifp, command, data);
+	ng_eiface_print_ioctl(ifp, cmd, data);
 #endif
 	crit_enter();
-	switch (command) {
+	switch (cmd) {
 
 	/* These two are mostly handled at a higher layer */
 	case SIOCSIFADDR:
-		error = ether_ioctl(ifp, command, data);
+		error = ether_ioctl(ifp, cmd, data);
 		break;
 	case SIOCGIFADDR:
 		break;
@@ -270,11 +271,11 @@ ng_eiface_start(struct ifnet *ifp)
  */
 
 static void
-ng_eiface_print_ioctl(struct ifnet *ifp, int command, caddr_t data)
+ng_eiface_print_ioctl(struct ifnet *ifp, int cmd, caddr_t data)
 {
 	char   *str;
 
-	switch (command & IOC_DIRMASK) {
+	switch (cmd & IOC_DIRMASK) {
 	case IOC_VOID:
 		str = "IO";
 		break;
@@ -293,9 +294,9 @@ ng_eiface_print_ioctl(struct ifnet *ifp, int command, caddr_t data)
 	log(LOG_DEBUG, "%s: %s('%c', %d, char[%d])\n",
 	       ifp->if_xname,
 	       str,
-	       IOCGROUP(command),
-	       command & 0xff,
-	       IOCPARM_LEN(command));
+	       IOCGROUP(cmd),
+	       cmd & 0xff,
+	       IOCPARM_LEN(cmd));
 }
 #endif /* DEBUG */
 
-- 
2.11.4.GIT