From b6c07be9be292e9da9db56400584ebe667c2fcaa Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sun, 6 Mar 2016 11:43:33 +0100
Subject: [PATCH] netgraph: revert an unused patch to the standard FreeBSD 10.2
 state

(cherry picked from commit b04f2d8598845aeb03e6c6aa88989c65f746314d)
---
 sys/netgraph/ng_eiface.c | 53 ----------------------------------------
 sys/netgraph/ng_eiface.h |  1 -
 2 files changed, 54 deletions(-)

diff --git a/sys/netgraph/ng_eiface.c b/sys/netgraph/ng_eiface.c
index 6db5199c3db..0f471bb88fe 100644
--- a/sys/netgraph/ng_eiface.c
+++ b/sys/netgraph/ng_eiface.c
@@ -43,7 +43,6 @@
 #include <net/if.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
-#include <net/if_dl.h>
 #include <net/netisr.h>
 #include <net/route.h>
 #include <net/vnet.h>
@@ -65,13 +64,6 @@ static const struct ng_cmdlist ng_eiface_cmdlist[] = {
 	  NULL,
 	  &ng_parse_string_type
 	},
-	{
-	  NGM_EIFACE_COOKIE,
-	  NGM_EIFACE_SET_IFNAME,
-	  "setifname",
-	  &ng_parse_string_type,
-	  NULL
-	},
 	{
 	  NGM_EIFACE_COOKIE,
 	  NGM_EIFACE_SET,
@@ -478,11 +470,6 @@ ng_eiface_rcvmsg(node_p node, item_p item, hook_p lasthook)
 	struct ng_mesg *resp = NULL;
 	int error = 0;
 	struct ng_mesg *msg;
-	char *new_name;
-        size_t namelen, onamelen;
-        struct sockaddr_dl *sdl = NULL;
-        struct ifaddr *ifa = NULL;
-	node_p ethernode;
 
 	NGI_GET_MSG(item, msg);
 	switch (msg->header.typecookie) {
@@ -509,46 +496,6 @@ ng_eiface_rcvmsg(node_p node, item_p item, hook_p lasthook)
 			}
 			strlcpy(resp->data, ifp->if_xname, IFNAMSIZ);
 			break;
-		case NGM_EIFACE_SET_IFNAME:
-			new_name = (char *)msg->data;
-                        
-                	/* Deny request if interface is UP */
-                	if ((ifp->if_flags & IFF_UP) != 0) {
-                  		error = EBUSY;
-                  		break;
-                        }
-                        
-                	EVENTHANDLER_INVOKE(ifnet_departure_event, ifp);
-
-			ethernode = ng_name2noderef(node, ifp->if_xname);
-                        if (ethernode != NULL)
-                                ng_name_node(ethernode, new_name);
-
-                	IF_ADDR_WLOCK(ifp);
-                	strlcpy(ifp->if_xname, new_name, sizeof(ifp->if_xname));
-                	ifa = ifp->if_addr;
-                	sdl = (struct sockaddr_dl *)ifa->ifa_addr;
-                	namelen = strlen(new_name) + 1;
-                	onamelen = sdl->sdl_nlen;
-                	/*
-                 	* Move the address if needed.  This is safe because we
-                 	* allocate space for a name of length IFNAMSIZ when we
-                 	* create this in if_attach().
-                	 */
-        	        if (namelen != onamelen) {
-	                        bcopy(sdl->sdl_data + onamelen,
-                        	    sdl->sdl_data + namelen, sdl->sdl_alen);
-                	}
-        	        bcopy(new_name, sdl->sdl_data, namelen);
-	                sdl->sdl_nlen = namelen;
-                	sdl = (struct sockaddr_dl *)ifa->ifa_netmask;
-        	        bzero(sdl->sdl_data, onamelen);
-	                while (namelen != 0)
-                        	sdl->sdl_data[--namelen] = 0xff;
-                	IF_ADDR_WUNLOCK(ifp);
-
-                	EVENTHANDLER_INVOKE(ifnet_arrival_event, ifp);
-			break;
 
 		case NGM_EIFACE_GET_IFADDRS:
 		    {
diff --git a/sys/netgraph/ng_eiface.h b/sys/netgraph/ng_eiface.h
index 9f1509beb8d..6fc1c5b6a4a 100644
--- a/sys/netgraph/ng_eiface.h
+++ b/sys/netgraph/ng_eiface.h
@@ -54,7 +54,6 @@ enum {
 	NGM_EIFACE_GET_IFNAME = 1,	/* get the interface name */
 	NGM_EIFACE_GET_IFADDRS,		/* returns list of addresses */
 	NGM_EIFACE_SET,			/* set ethernet address */
-	NGM_EIFACE_SET_IFNAME,
 };
 
 #endif /* _NETGRAPH_NG_EIFACE_H_ */