From 4cde4dd5aa55bc5b1c84b506379fa9074fa836c1 Mon Sep 17 00:00:00 2001
From: Joerg Sonnenberger <joerg@dragonflybsd.org>
Date: Fri, 27 May 2005 15:36:10 +0000
Subject: [PATCH] Use ether_ioctl for the default case and merge the cases
 which just call it.

---
 sys/dev/netif/an/if_an.c     |  9 ++-------
 sys/dev/netif/bfe/if_bfe.c   | 10 ++--------
 sys/dev/netif/bge/if_bge.c   |  8 ++------
 sys/dev/netif/cs/if_cs.c     | 14 ++++----------
 sys/dev/netif/ed/if_ed.c     | 12 +++---------
 sys/dev/netif/el/if_el.c     | 11 +++--------
 sys/dev/netif/ep/if_ep.c     | 10 ++--------
 sys/dev/netif/ex/if_ex.c     | 11 +++--------
 sys/dev/netif/fe/if_fe.c     | 12 ++----------
 sys/dev/netif/gx/if_gx.c     |  8 ++------
 sys/dev/netif/ie/if_ie.c     | 11 +++--------
 sys/dev/netif/le/if_le.c     | 14 ++++----------
 sys/dev/netif/lge/if_lge.c   |  8 ++------
 sys/dev/netif/lnc/if_lnc.c   | 11 +++--------
 sys/dev/netif/my/if_my.c     |  9 ++-------
 sys/dev/netif/owi/if_owi.c   |  9 ++-------
 sys/dev/netif/pcn/if_pcn.c   |  9 ++-------
 sys/dev/netif/ray/if_ray.c   | 15 +++------------
 sys/dev/netif/rdp/if_rdp.c   | 12 +++---------
 sys/dev/netif/sbni/if_sbni.c | 10 +++-------
 sys/dev/netif/sbsh/if_sbsh.c | 12 ++----------
 sys/dev/netif/sf/if_sf.c     |  9 ++-------
 sys/dev/netif/sk/if_sk.c     |  8 ++------
 sys/dev/netif/sn/if_sn.c     | 11 +++--------
 sys/dev/netif/snc/dp83932.c  | 12 +++---------
 sys/dev/netif/ste/if_ste.c   |  9 ++-------
 sys/dev/netif/ti/if_ti.c     |  8 ++------
 sys/dev/netif/tl/if_tl.c     |  9 ++-------
 sys/dev/netif/tx/if_tx.c     |  9 +++------
 sys/dev/netif/vr/if_vr.c     |  9 ++-------
 sys/dev/netif/vx/if_vx.c     | 10 +++-------
 sys/dev/netif/wb/if_wb.c     |  9 ++-------
 sys/dev/netif/wl/if_wl.c     | 11 +++--------
 sys/dev/netif/xe/if_xe.c     | 11 +++--------
 sys/dev/netif/xl/if_xl.c     |  9 ++-------
 35 files changed, 88 insertions(+), 271 deletions(-)

diff --git a/sys/dev/netif/an/if_an.c b/sys/dev/netif/an/if_an.c
index e673365054..f330bac7ad 100644
--- a/sys/dev/netif/an/if_an.c
+++ b/sys/dev/netif/an/if_an.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/an/if_an.c,v 1.2.2.13 2003/02/11 03:32:48 ambrisko Exp $
- * $DragonFly: src/sys/dev/netif/an/if_an.c,v 1.20 2005/05/24 09:52:12 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/an/if_an.c,v 1.21 2005/05/27 15:36:09 joerg Exp $
  */
 
 /*
@@ -1872,11 +1872,6 @@ an_ioctl(ifp, command, data, cr)
 	}
 
 	switch (command) {
-	case SIOCSIFADDR:
-	case SIOCGIFADDR:
-	case SIOCSIFMTU:
-		error = ether_ioctl(ifp, command, data);
-		break;
 	case SIOCSIFFLAGS:
 		if (ifp->if_flags & IFF_UP) {
 			if (ifp->if_flags & IFF_RUNNING &&
@@ -2401,7 +2396,7 @@ an_ioctl(ifp, command, data, cr)
 			an_setdef(sc, &sc->areq);
 		break;
 	default:
-		error = EINVAL;
+		error = ether_ioctl(ifp, command, data);
 		break;
 	}
 out:
diff --git a/sys/dev/netif/bfe/if_bfe.c b/sys/dev/netif/bfe/if_bfe.c
index 7004f372ed..62ffde56a0 100644
--- a/sys/dev/netif/bfe/if_bfe.c
+++ b/sys/dev/netif/bfe/if_bfe.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/bfe/if_bfe.c 1.4.4.7 2004/03/02 08:41:33 julian Exp  v
- * $DragonFly: src/sys/dev/netif/bfe/if_bfe.c,v 1.15 2005/05/24 20:59:00 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/bfe/if_bfe.c,v 1.16 2005/05/27 15:36:09 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -1449,14 +1449,8 @@ bfe_ioctl(struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr)
 			error = ifmedia_ioctl(ifp, ifr, &mii->mii_media,
 					      command);
 			break;
-		case SIOCSIFADDR:
-		case SIOCGIFADDR:
-		case SIOCSIFMTU:
-			error = ether_ioctl(ifp, command, data);
-			break;
-
 		default:
-			error = EINVAL;
+			error = ether_ioctl(ifp, command, data);
 			break;
 	}
 
diff --git a/sys/dev/netif/bge/if_bge.c b/sys/dev/netif/bge/if_bge.c
index 0a2007ce45..15feaaf9a4 100644
--- a/sys/dev/netif/bge/if_bge.c
+++ b/sys/dev/netif/bge/if_bge.c
@@ -31,7 +31,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/bge/if_bge.c,v 1.3.2.29 2003/12/01 21:06:59 ambrisko Exp $
- * $DragonFly: src/sys/dev/netif/bge/if_bge.c,v 1.36 2005/05/25 21:35:51 hsu Exp $
+ * $DragonFly: src/sys/dev/netif/bge/if_bge.c,v 1.37 2005/05/27 15:36:09 joerg Exp $
  *
  */
 
@@ -2521,10 +2521,6 @@ bge_ioctl(struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr)
 	s = splimp();
 
 	switch(command) {
-	case SIOCSIFADDR:
-	case SIOCGIFADDR:
-		error = ether_ioctl(ifp, command, data);
-		break;
 	case SIOCSIFMTU:
 		/* Disallow jumbo frames on 5705. */
 		if ((sc->bge_asicrev == BGE_ASICREV_BCM5705 &&
@@ -2595,7 +2591,7 @@ bge_ioctl(struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr)
 		error = 0;
 		break;
 	default:
-		error = EINVAL;
+		error = ether_ioctl(ifp, command, data);
 		break;
 	}
 
diff --git a/sys/dev/netif/cs/if_cs.c b/sys/dev/netif/cs/if_cs.c
index 22ff5d53ff..22fc3fdbeb 100644
--- a/sys/dev/netif/cs/if_cs.c
+++ b/sys/dev/netif/cs/if_cs.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/cs/if_cs.c,v 1.19.2.1 2001/01/25 20:13:48 imp Exp $
- * $DragonFly: src/sys/dev/netif/cs/if_cs.c,v 1.15 2005/05/24 09:52:13 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/cs/if_cs.c,v 1.16 2005/05/27 15:36:09 joerg Exp $
  */
 
 /*
@@ -1086,12 +1086,6 @@ cs_ioctl(register struct ifnet *ifp, u_long command, caddr_t data,
 	s=splimp();
 
 	switch (command) {
-	case SIOCSIFADDR:
-	case SIOCGIFADDR:
-	case SIOCSIFMTU:
-		ether_ioctl(ifp, command, data);
-		break;
-
 	case SIOCSIFFLAGS:
 		/*
 		 * Switch interface state between "running" and
@@ -1131,9 +1125,9 @@ cs_ioctl(register struct ifnet *ifp, u_long command, caddr_t data,
         case SIOCGIFMEDIA:
                 error = ifmedia_ioctl(ifp, ifr, &sc->media, command);
                 break;
-
-        default:
-		error = EINVAL;
+	default:
+		error = ether_ioctl(ifp, command, data);
+		break;
         }
 
 	(void) splx(s);
diff --git a/sys/dev/netif/ed/if_ed.c b/sys/dev/netif/ed/if_ed.c
index 72e6f02d70..6aefc3f390 100644
--- a/sys/dev/netif/ed/if_ed.c
+++ b/sys/dev/netif/ed/if_ed.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ed/if_ed.c,v 1.224 2003/12/08 07:54:12 obrien Exp $
- * $DragonFly: src/sys/dev/netif/ed/if_ed.c,v 1.20 2005/05/24 09:52:13 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/ed/if_ed.c,v 1.21 2005/05/27 15:36:09 joerg Exp $
  */
 
 /*
@@ -2668,13 +2668,6 @@ ed_ioctl(ifp, command, data, cr)
 	s = splimp();
 
 	switch (command) {
-
-	case SIOCSIFADDR:
-	case SIOCGIFADDR:
-	case SIOCSIFMTU:
-		error = ether_ioctl(ifp, command, data);
-		break;
-
 	case SIOCSIFFLAGS:
 
 		/*
@@ -2734,7 +2727,8 @@ ed_ioctl(ifp, command, data, cr)
 #endif
 
 	default:
-		error = EINVAL;
+		error = ether_ioctl(ifp, command, data);
+		break;
 	}
 	(void) splx(s);
 	return (error);
diff --git a/sys/dev/netif/el/if_el.c b/sys/dev/netif/el/if_el.c
index 664e5bc04a..4f06b910cd 100644
--- a/sys/dev/netif/el/if_el.c
+++ b/sys/dev/netif/el/if_el.c
@@ -7,7 +7,7 @@
  * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
  *
  * $FreeBSD: src/sys/i386/isa/if_el.c,v 1.47.2.2 2000/07/17 21:24:30 archie Exp $
- * $DragonFly: src/sys/dev/netif/el/if_el.c,v 1.13 2005/02/15 20:28:38 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/el/if_el.c,v 1.14 2005/05/27 15:36:09 joerg Exp $
  */
 /* Except of course for the portions of code lifted from other FreeBSD
  * drivers (mainly elread, elget and el_ioctl)
@@ -602,12 +602,6 @@ el_ioctl(struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr)
 	s = splimp();
 
 	switch (command) {
-        case SIOCSIFADDR:
-	case SIOCGIFADDR:
-	case SIOCSIFMTU:
-		error = ether_ioctl(ifp, command, data);
-		break;
-
 	case SIOCSIFFLAGS:
 		/*
 		 * If interface is marked down and it is running, then stop it
@@ -626,7 +620,8 @@ el_ioctl(struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr)
 		}
 		break;
 	default:
-		error = EINVAL;
+		error = ether_ioctl(ifp, command, data);
+		break;
 	}
 	(void) splx(s);
 	return (error);
diff --git a/sys/dev/netif/ep/if_ep.c b/sys/dev/netif/ep/if_ep.c
index 8980571dad..249f48da6c 100644
--- a/sys/dev/netif/ep/if_ep.c
+++ b/sys/dev/netif/ep/if_ep.c
@@ -39,7 +39,7 @@
 
 /*
  * $FreeBSD: src/sys/dev/ep/if_ep.c,v 1.95.2.3 2002/03/06 07:26:35 imp Exp $
- * $DragonFly: src/sys/dev/netif/ep/if_ep.c,v 1.15 2005/05/24 09:52:13 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/ep/if_ep.c,v 1.16 2005/05/27 15:36:09 joerg Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -857,12 +857,6 @@ ep_if_ioctl(ifp, cmd, data, cr)
 	s = splimp();
 
 	switch (cmd) {
-	case SIOCSIFADDR:
-	case SIOCGIFADDR:
-	case SIOCSIFMTU:
-		error = ether_ioctl(ifp, cmd, data);
-	break;
-
 	case SIOCSIFFLAGS:
 		if (((ifp->if_flags & IFF_UP) == 0) &&
 		    (ifp->if_flags & IFF_RUNNING)) {
@@ -899,7 +893,7 @@ ep_if_ioctl(ifp, cmd, data, cr)
 		}
 		break;
 	default:
-		error = EINVAL;
+		error = ether_ioctl(ifp, cmd, data);
 		break;
 	}
 
diff --git a/sys/dev/netif/ex/if_ex.c b/sys/dev/netif/ex/if_ex.c
index 0e9b122d23..841a65f46b 100644
--- a/sys/dev/netif/ex/if_ex.c
+++ b/sys/dev/netif/ex/if_ex.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ex/if_ex.c,v 1.26.2.3 2001/03/05 05:33:20 imp Exp $
- * $DragonFly: src/sys/dev/netif/ex/if_ex.c,v 1.16 2005/05/24 09:52:13 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/ex/if_ex.c,v 1.17 2005/05/27 15:36:09 joerg Exp $
  *
  * MAINTAINER: Matthew N. Dodd <winter@jurai.net>
  *                             <mdodd@FreeBSD.org>
@@ -777,12 +777,6 @@ ex_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data, struct ucred *cr)
 	s = splimp();
 
 	switch(cmd) {
-		case SIOCSIFADDR:
-		case SIOCGIFADDR:
-		case SIOCSIFMTU:
-			error = ether_ioctl(ifp, cmd, data);
-			break;
-
 		case SIOCSIFFLAGS:
 			DODEBUG(Start_End, printf("SIOCSIFFLAGS"););
 			if ((ifp->if_flags & IFF_UP) == 0 &&
@@ -814,7 +808,8 @@ ex_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data, struct ucred *cr)
 			break;
 		default:
 			DODEBUG(Start_End, printf("unknown"););
-			error = EINVAL;
+			error = ether_ioctl(ifp, cmd, data);
+			break;
 	}
 
 	splx(s);
diff --git a/sys/dev/netif/fe/if_fe.c b/sys/dev/netif/fe/if_fe.c
index 4c271c450c..021290e106 100644
--- a/sys/dev/netif/fe/if_fe.c
+++ b/sys/dev/netif/fe/if_fe.c
@@ -22,7 +22,7 @@
 
 /*
  * $FreeBSD: src/sys/dev/fe/if_fe.c,v 1.65.2.1 2000/09/22 10:01:47 nyan Exp $
- * $DragonFly: src/sys/dev/netif/fe/if_fe.c,v 1.15 2005/05/24 20:59:01 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/fe/if_fe.c,v 1.16 2005/05/27 15:36:09 joerg Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * Contributed by M. Sekiguchi. <seki@sysrap.cs.fujitsu.co.jp>
@@ -1766,14 +1766,6 @@ fe_ioctl (struct ifnet * ifp, u_long command, caddr_t data, struct ucred *cr)
 	s = splimp();
 
 	switch (command) {
-
-	  case SIOCSIFADDR:
-	  case SIOCGIFADDR:
-	  case SIOCSIFMTU:
-		/* Just an ordinary action.  */
-		error = ether_ioctl(ifp, command, data);
-		break;
-
 	  case SIOCSIFFLAGS:
 		/*
 		 * Switch interface state between "running" and
@@ -1813,7 +1805,7 @@ fe_ioctl (struct ifnet * ifp, u_long command, caddr_t data, struct ucred *cr)
 		break;
 
 	  default:
-		error = EINVAL;
+		error = ether_ioctl(ifp, command, data);
 		break;
 	}
 
diff --git a/sys/dev/netif/gx/if_gx.c b/sys/dev/netif/gx/if_gx.c
index 53dfe3f9f2..476dfad207 100644
--- a/sys/dev/netif/gx/if_gx.c
+++ b/sys/dev/netif/gx/if_gx.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/gx/if_gx.c,v 1.2.2.3 2001/12/14 19:51:39 jlemon Exp $
- * $DragonFly: src/sys/dev/netif/gx/Attic/if_gx.c,v 1.15 2005/05/24 20:59:01 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/gx/Attic/if_gx.c,v 1.16 2005/05/27 15:36:09 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -917,10 +917,6 @@ gx_ioctl(struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr)
 	GX_LOCK(gx);
 
 	switch (command) {
-	case SIOCSIFADDR:
-	case SIOCGIFADDR:
-		error = ether_ioctl(ifp, command, data);
-		break;
 	case SIOCSIFMTU:
 		if (ifr->ifr_mtu > GX_MAX_MTU) {
 			error = EINVAL;
@@ -971,7 +967,7 @@ gx_ioctl(struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr)
 		}
 		break;
 	default:
-		error = EINVAL;
+		error = ether_ioctl(ifp, command, data);
 		break;
 	}
 
diff --git a/sys/dev/netif/ie/if_ie.c b/sys/dev/netif/ie/if_ie.c
index f46b7811fd..bad715ce2d 100644
--- a/sys/dev/netif/ie/if_ie.c
+++ b/sys/dev/netif/ie/if_ie.c
@@ -48,7 +48,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ie/if_ie.c,v 1.72.2.4 2003/03/27 21:01:49 mdodd Exp $
- * $DragonFly: src/sys/dev/netif/ie/if_ie.c,v 1.17 2005/02/18 23:25:38 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/ie/if_ie.c,v 1.18 2005/05/27 15:36:09 joerg Exp $
  */
 
 /*
@@ -2112,12 +2112,6 @@ ieioctl(struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr)
 	s = splimp();
 
 	switch (command) {
-        case SIOCSIFADDR:
-        case SIOCGIFADDR:
-	case SIOCSIFMTU:
-		error = ether_ioctl(ifp, command, data);
-		break;
-
 	case SIOCSIFFLAGS:
 		/*
 		 * Note that this device doesn't have an "all multicast"
@@ -2152,7 +2146,8 @@ ieioctl(struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr)
 		break;
 
 	default:
-		error = EINVAL;
+		error = ether_ioctl(ifp, command, data);
+		break;
 	}
 
 	splx(s);
diff --git a/sys/dev/netif/le/if_le.c b/sys/dev/netif/le/if_le.c
index 1bb72a1951..ba7702d95a 100644
--- a/sys/dev/netif/le/if_le.c
+++ b/sys/dev/netif/le/if_le.c
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/if_le.c,v 1.56.2.4 2002/06/05 23:24:10 paul Exp $
- * $DragonFly: src/sys/dev/netif/le/if_le.c,v 1.23 2005/05/08 11:45:32 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/le/if_le.c,v 1.24 2005/05/27 15:36:09 joerg Exp $
  */
 
 /*
@@ -382,12 +382,6 @@ le_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data, struct ucred *cr)
     s = splimp();
 
     switch (cmd) {
-        case SIOCSIFADDR:
-        case SIOCGIFADDR:
-        case SIOCSIFMTU:
-                error = ether_ioctl(ifp, cmd, data);
-                break;
-
 	case SIOCSIFFLAGS: {
 	    sc->if_init(sc);
 	    break;
@@ -402,9 +396,9 @@ le_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data, struct ucred *cr)
 		error = 0;
 		break;
 
-	default: {
-	    error = EINVAL;
-	}
+	default:
+		error = ether_ioctl(ifp, cmd, data);
+		break;
     }
 
     splx(s);
diff --git a/sys/dev/netif/lge/if_lge.c b/sys/dev/netif/lge/if_lge.c
index 191bf94d3e..b1c18fbac1 100644
--- a/sys/dev/netif/lge/if_lge.c
+++ b/sys/dev/netif/lge/if_lge.c
@@ -31,7 +31,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/lge/if_lge.c,v 1.5.2.2 2001/12/14 19:49:23 jlemon Exp $
- * $DragonFly: src/sys/dev/netif/lge/if_lge.c,v 1.25 2005/05/24 20:59:01 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/lge/if_lge.c,v 1.26 2005/05/27 15:36:09 joerg Exp $
  */
 
 /*
@@ -1352,10 +1352,6 @@ lge_ioctl(struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr)
 	s = splimp();
 
 	switch(command) {
-	case SIOCSIFADDR:
-	case SIOCGIFADDR:
-		error = ether_ioctl(ifp, command, data);
-		break;
 	case SIOCSIFMTU:
 		if (ifr->ifr_mtu > LGE_JUMBO_MTU)
 			error = EINVAL;
@@ -1397,7 +1393,7 @@ lge_ioctl(struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr)
 		error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, command);
 		break;
 	default:
-		error = EINVAL;
+		error = ether_ioctl(ifp, command, data);
 		break;
 	}
 
diff --git a/sys/dev/netif/lnc/if_lnc.c b/sys/dev/netif/lnc/if_lnc.c
index 0890eb5027..16fcf09356 100644
--- a/sys/dev/netif/lnc/if_lnc.c
+++ b/sys/dev/netif/lnc/if_lnc.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/lnc/if_lnc.c,v 1.89 2001/07/04 13:00:19 nyan Exp $
- * $DragonFly: src/sys/dev/netif/lnc/Attic/if_lnc.c,v 1.17 2005/02/19 00:16:54 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/lnc/Attic/if_lnc.c,v 1.18 2005/05/27 15:36:09 joerg Exp $
  */
 
 /*
@@ -1401,12 +1401,6 @@ lnc_ioctl(struct ifnet * ifp, u_long command, caddr_t data, struct ucred *cr)
 	s = splimp();
 
 	switch (command) {
-        case SIOCSIFADDR:
-        case SIOCGIFADDR:
-        case SIOCSIFMTU:
-                error = ether_ioctl(ifp, command, data);
-                break;
-
 	case SIOCSIFFLAGS:
 #ifdef DEBUG
 		if (ifp->if_flags & IFF_DEBUG)
@@ -1457,7 +1451,8 @@ lnc_ioctl(struct ifnet * ifp, u_long command, caddr_t data, struct ucred *cr)
 		error = 0;
 		break;
 	default:
-		error = EINVAL;
+                error = ether_ioctl(ifp, command, data);
+                break;
 	}
 	(void) splx(s);
 	return error;
diff --git a/sys/dev/netif/my/if_my.c b/sys/dev/netif/my/if_my.c
index 2668c8cf29..ec1d0609e7 100644
--- a/sys/dev/netif/my/if_my.c
+++ b/sys/dev/netif/my/if_my.c
@@ -26,7 +26,7 @@
  * Written by: yen_cw@myson.com.tw  available at: http://www.myson.com.tw/
  *
  * $FreeBSD: src/sys/dev/my/if_my.c,v 1.2.2.4 2002/04/17 02:05:27 julian Exp $
- * $DragonFly: src/sys/dev/netif/my/if_my.c,v 1.18 2005/05/24 20:59:01 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/my/if_my.c,v 1.19 2005/05/27 15:36:09 joerg Exp $
  *
  * Myson fast ethernet PCI NIC driver
  *
@@ -1716,11 +1716,6 @@ my_ioctl(struct ifnet * ifp, u_long command, caddr_t data, struct ucred *cr)
 	s = splimp();
 	MY_LOCK(sc);
 	switch (command) {
-	case SIOCSIFADDR:
-	case SIOCGIFADDR:
-	case SIOCSIFMTU:
-		error = ether_ioctl(ifp, command, data);
-		break;
 	case SIOCSIFFLAGS:
 		if (ifp->if_flags & IFF_UP)
 			my_init(sc);
@@ -1738,7 +1733,7 @@ my_ioctl(struct ifnet * ifp, u_long command, caddr_t data, struct ucred *cr)
 		error = ifmedia_ioctl(ifp, ifr, &sc->ifmedia, command);
 		break;
 	default:
-		error = EINVAL;
+		error = ether_ioctl(ifp, command, data);
 		break;
 	}
 	MY_UNLOCK(sc);
diff --git a/sys/dev/netif/owi/if_owi.c b/sys/dev/netif/owi/if_owi.c
index ded4e73b06..1ca54a7503 100644
--- a/sys/dev/netif/owi/if_owi.c
+++ b/sys/dev/netif/owi/if_owi.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/wi/if_wi.c,v 1.103.2.2 2002/08/02 07:11:34 imp Exp $
- * $DragonFly: src/sys/dev/netif/owi/Attic/if_owi.c,v 1.6 2005/05/24 20:59:02 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/owi/Attic/if_owi.c,v 1.7 2005/05/27 15:36:09 joerg Exp $
  */
 
 /*
@@ -1643,11 +1643,6 @@ wi_ioctl(ifp, command, data, cr)
 	}
 
 	switch(command) {
-	case SIOCSIFADDR:
-	case SIOCGIFADDR:
-	case SIOCSIFMTU:
-		error = ether_ioctl(ifp, command, data);
-		break;
 	case SIOCSIFFLAGS:
 		/*
 		 * Can't do promisc and hostap at the same time.  If all that's
@@ -2002,7 +1997,7 @@ wi_ioctl(ifp, command, data, cr)
 		error = owihap_ioctl(sc, command, data);
 		break;
 	default:
-		error = EINVAL;
+		error = ether_ioctl(ifp, command, data);
 		break;
 	}
 out:
diff --git a/sys/dev/netif/pcn/if_pcn.c b/sys/dev/netif/pcn/if_pcn.c
index 3b83b2737d..0c2b9a3833 100644
--- a/sys/dev/netif/pcn/if_pcn.c
+++ b/sys/dev/netif/pcn/if_pcn.c
@@ -31,7 +31,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_pcn.c,v 1.5.2.10 2003/03/05 18:42:33 njl Exp $
- * $DragonFly: src/sys/dev/netif/pcn/if_pcn.c,v 1.19 2005/05/24 20:59:02 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/pcn/if_pcn.c,v 1.20 2005/05/27 15:36:09 joerg Exp $
  */
 
 /*
@@ -1253,11 +1253,6 @@ static int pcn_ioctl(ifp, command, data, cr)
 	s = splimp();
 
 	switch(command) {
-	case SIOCSIFADDR:
-	case SIOCGIFADDR:
-	case SIOCSIFMTU:
-		error = ether_ioctl(ifp, command, data);
-		break;
 	case SIOCSIFFLAGS:
 		if (ifp->if_flags & IFF_UP) {
                         if (ifp->if_flags & IFF_RUNNING &&
@@ -1300,7 +1295,7 @@ static int pcn_ioctl(ifp, command, data, cr)
 		error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, command);
 		break;
 	default:
-		error = EINVAL;
+		error = ether_ioctl(ifp, command, data);
 		break;
 	}
 
diff --git a/sys/dev/netif/ray/if_ray.c b/sys/dev/netif/ray/if_ray.c
index d181991eb6..15f733ef3a 100644
--- a/sys/dev/netif/ray/if_ray.c
+++ b/sys/dev/netif/ray/if_ray.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ray/if_ray.c,v 1.47.2.4 2001/08/14 22:54:05 dmlb Exp $
- * $DragonFly: src/sys/dev/netif/ray/Attic/if_ray.c,v 1.19 2005/05/24 20:59:02 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/ray/Attic/if_ray.c,v 1.20 2005/05/27 15:36:10 joerg Exp $
  *
  */
 
@@ -648,15 +648,6 @@ ray_ioctl(register struct ifnet *ifp, u_long command, caddr_t data,
 	s = splimp();
 
 	switch (command) {
-
-	case SIOCGIFADDR:
-	case SIOCSIFMTU:
-	case SIOCSIFADDR:
-		RAY_DPRINTF(sc, RAY_DBG_IOCTL, "GIFADDR/SIFMTU");
-		error = ether_ioctl(ifp, command, data);
-/* XXX SIFADDR used to fall through to SIOCSIFFLAGS */
-		break;
-
 	case SIOCSIFFLAGS:
 		RAY_DPRINTF(sc, RAY_DBG_IOCTL, "SIFFLAGS 0x%0x", ifp->if_flags);
 		/*
@@ -738,8 +729,8 @@ ray_ioctl(register struct ifnet *ifp, u_long command, caddr_t data,
 		break;
 
 	default:
-		error = EINVAL;
-
+		error = ether_ioctl(ifp, command, data);
+		break;
 	}
 
 	splx(s);
diff --git a/sys/dev/netif/rdp/if_rdp.c b/sys/dev/netif/rdp/if_rdp.c
index 07c45d2d93..803935c45d 100644
--- a/sys/dev/netif/rdp/if_rdp.c
+++ b/sys/dev/netif/rdp/if_rdp.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/if_rdp.c,v 1.6.2.2 2000/07/17 21:24:32 archie Exp $
- * $DragonFly: src/sys/dev/netif/rdp/if_rdp.c,v 1.14 2005/02/19 22:42:55 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/rdp/if_rdp.c,v 1.15 2005/05/27 15:36:10 joerg Exp $
  */
 
 /*
@@ -827,13 +827,6 @@ rdp_ioctl(struct ifnet *ifp, IOCTL_CMD_T command, caddr_t data,
 	s = splimp();
 
 	switch (command) {
-
-	case SIOCSIFADDR:
-	case SIOCGIFADDR:
-	case SIOCSIFMTU:
-		error = ether_ioctl(ifp, command, data);
-		break;
-
 	case SIOCSIFFLAGS:
 		/*
 		 * If the interface is marked up and stopped, then start it.
@@ -869,7 +862,8 @@ rdp_ioctl(struct ifnet *ifp, IOCTL_CMD_T command, caddr_t data,
 		break;
 
 	default:
-		error = EINVAL;
+		error = ether_ioctl(ifp, command, data);
+		break;
 	}
 	(void) splx(s);
 	return (error);
diff --git a/sys/dev/netif/sbni/if_sbni.c b/sys/dev/netif/sbni/if_sbni.c
index 77dea49f89..0b614aa81e 100644
--- a/sys/dev/netif/sbni/if_sbni.c
+++ b/sys/dev/netif/sbni/if_sbni.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.1.2.4 2002/08/11 09:32:00 fjoe Exp $
- * $DragonFly: src/sys/dev/netif/sbni/if_sbni.c,v 1.18 2005/02/19 22:49:34 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/sbni/if_sbni.c,v 1.19 2005/05/27 15:36:10 joerg Exp $
  */
 
 /*
@@ -1050,11 +1050,6 @@ sbni_ioctl(struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr)
 	s = splimp();
 
 	switch (command) {
-	case SIOCSIFADDR:
-	case SIOCGIFADDR:
-		ether_ioctl(ifp, command, data);
-		break;
-
 	case SIOCSIFFLAGS:
 		/*
 		 * If the interface is marked up and stopped, then start it.
@@ -1137,7 +1132,8 @@ sbni_ioctl(struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr)
 		break;
 
 	default:
-		error = EINVAL;
+		error = ether_ioctl(ifp, command, data);
+		break;
 	}
 
 	splx(s);
diff --git a/sys/dev/netif/sbsh/if_sbsh.c b/sys/dev/netif/sbsh/if_sbsh.c
index 98f0edc308..4d5089a61b 100644
--- a/sys/dev/netif/sbsh/if_sbsh.c
+++ b/sys/dev/netif/sbsh/if_sbsh.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/sbsh/if_sbsh.c,v 1.3.2.1 2003/04/15 18:15:07 fjoe Exp $
- * $DragonFly: src/sys/dev/netif/sbsh/if_sbsh.c,v 1.17 2005/05/24 20:59:02 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/sbsh/if_sbsh.c,v 1.18 2005/05/27 15:36:10 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -473,13 +473,6 @@ sbsh_ioctl(struct ifnet	*ifp, u_long cmd, caddr_t data, struct ucred *cr)
 				error = EIO;
 		}
 		break;
-
-	case SIOCSIFADDR:
-	case SIOCGIFADDR:
-	case SIOCSIFMTU:
-		error = ether_ioctl(ifp, cmd, data);
-		break;
-
 	case SIOCSIFFLAGS:
 		if (ifp->if_flags & IFF_UP) {
 			if (!(ifp->if_flags & IFF_RUNNING)) {
@@ -501,9 +494,8 @@ sbsh_ioctl(struct ifnet	*ifp, u_long cmd, caddr_t data, struct ucred *cr)
 	case SIOCDELMULTI:
 		error = 0;
 		break;
-
 	default:
-		error = EINVAL;
+		error = ether_ioctl(ifp, cmd, data);
 		break;
 	}
 
diff --git a/sys/dev/netif/sf/if_sf.c b/sys/dev/netif/sf/if_sf.c
index cca838b83a..5bb8ccfdd5 100644
--- a/sys/dev/netif/sf/if_sf.c
+++ b/sys/dev/netif/sf/if_sf.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_sf.c,v 1.18.2.8 2001/12/16 15:46:07 luigi Exp $
- * $DragonFly: src/sys/dev/netif/sf/if_sf.c,v 1.18 2005/05/24 20:59:02 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/sf/if_sf.c,v 1.19 2005/05/27 15:36:10 joerg Exp $
  */
 
 /*
@@ -535,11 +535,6 @@ static int sf_ioctl(ifp, command, data, cr)
 	s = splimp();
 
 	switch(command) {
-	case SIOCSIFADDR:
-	case SIOCGIFADDR:
-	case SIOCSIFMTU:
-		error = ether_ioctl(ifp, command, data);
-		break;
 	case SIOCSIFFLAGS:
 		if (ifp->if_flags & IFF_UP) {
 			if (ifp->if_flags & IFF_RUNNING &&
@@ -570,7 +565,7 @@ static int sf_ioctl(ifp, command, data, cr)
 		error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, command);
 		break;
 	default:
-		error = EINVAL;
+		error = ether_ioctl(ifp, command, data);
 		break;
 	}
 
diff --git a/sys/dev/netif/sk/if_sk.c b/sys/dev/netif/sk/if_sk.c
index 35774ffd9d..938152104c 100644
--- a/sys/dev/netif/sk/if_sk.c
+++ b/sys/dev/netif/sk/if_sk.c
@@ -32,7 +32,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_sk.c,v 1.19.2.9 2003/03/05 18:42:34 njl Exp $
- * $DragonFly: src/sys/dev/netif/sk/if_sk.c,v 1.30 2005/05/26 22:49:17 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/sk/if_sk.c,v 1.31 2005/05/27 15:36:10 joerg Exp $
  */
 
 /*
@@ -1119,10 +1119,6 @@ sk_ioctl(struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr)
 	s = splimp();
 
 	switch(command) {
-	case SIOCSIFADDR:
-	case SIOCGIFADDR:
-		error = ether_ioctl(ifp, command, data);
-		break;
 	case SIOCSIFMTU:
 		if (ifr->ifr_mtu > SK_JUMBO_MTU)
 			error = EINVAL;
@@ -1159,7 +1155,7 @@ sk_ioctl(struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr)
 		error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, command);
 		break;
 	default:
-		error = EINVAL;
+		error = ether_ioctl(ifp, command, data);
 		break;
 	}
 
diff --git a/sys/dev/netif/sn/if_sn.c b/sys/dev/netif/sn/if_sn.c
index 454c03bdcd..3bafebf212 100644
--- a/sys/dev/netif/sn/if_sn.c
+++ b/sys/dev/netif/sn/if_sn.c
@@ -29,7 +29,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *   $FreeBSD: src/sys/dev/sn/if_sn.c,v 1.7.2.3 2001/02/04 04:38:38 toshi Exp $
- *   $DragonFly: src/sys/dev/netif/sn/if_sn.c,v 1.15 2005/05/24 20:59:02 dillon Exp $
+ *   $DragonFly: src/sys/dev/netif/sn/if_sn.c,v 1.16 2005/05/27 15:36:10 joerg Exp $
  */
 
 /*
@@ -1129,12 +1129,6 @@ snioctl(struct ifnet *ifp, u_long cmd, caddr_t data, struct ucred *cr)
 	s = splimp();
 
 	switch (cmd) {
-	case SIOCSIFADDR:
-	case SIOCGIFADDR:
-	case SIOCSIFMTU:
-		error = ether_ioctl(ifp, cmd, data);
-		break;
-
 	case SIOCSIFFLAGS:
 		if ((ifp->if_flags & IFF_UP) == 0 && ifp->if_flags & IFF_RUNNING) {
 			ifp->if_flags &= ~IFF_RUNNING;
@@ -1165,7 +1159,8 @@ snioctl(struct ifnet *ifp, u_long cmd, caddr_t data, struct ucred *cr)
 	    error = 0;
 	    break;
 	default:
-		error = EINVAL;
+		error = ether_ioctl(ifp, cmd, data);
+		break;
 	}
 
 	splx(s);
diff --git a/sys/dev/netif/snc/dp83932.c b/sys/dev/netif/snc/dp83932.c
index 03e0f54192..03798f2bad 100644
--- a/sys/dev/netif/snc/dp83932.c
+++ b/sys/dev/netif/snc/dp83932.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/sys/dev/snc/dp83932.c,v 1.1.2.2 2003/02/11 08:52:00 nyan Exp $	*/
-/*	$DragonFly: src/sys/dev/netif/snc/Attic/dp83932.c,v 1.13 2005/02/20 02:54:21 joerg Exp $	*/
+/*	$DragonFly: src/sys/dev/netif/snc/Attic/dp83932.c,v 1.14 2005/05/27 15:36:10 joerg Exp $	*/
 /*	$NecBSD: dp83932.c,v 1.5 1999/07/29 05:08:44 kmatsuda Exp $	*/
 /*	$NetBSD: if_snc.c,v 1.18 1998/04/25 21:27:40 scottr Exp $	*/
 
@@ -272,13 +272,6 @@ sncioctl(ifp, cmd, data, cr)
 	int	temp;
 
 	switch (cmd) {
-
-	case SIOCSIFADDR:
-	case SIOCGIFADDR:
-	case SIOCSIFMTU:
-		err = ether_ioctl(ifp, cmd, data);
-		break;
-
 	case SIOCSIFFLAGS:
 		if ((ifp->if_flags & IFF_UP) == 0 &&
 		    (ifp->if_flags & IFF_RUNNING) != 0) {
@@ -327,7 +320,8 @@ sncioctl(ifp, cmd, data, cr)
 		err = ifmedia_ioctl(ifp, ifr, &sc->sc_media, cmd);
 		break;
 	default:
-		err = EINVAL;
+		err = ether_ioctl(ifp, cmd, data);
+		break;
 	}
 	splx(s);
 	return (err);
diff --git a/sys/dev/netif/ste/if_ste.c b/sys/dev/netif/ste/if_ste.c
index 259b1b69d0..2bd69df0a7 100644
--- a/sys/dev/netif/ste/if_ste.c
+++ b/sys/dev/netif/ste/if_ste.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_ste.c,v 1.14.2.9 2003/02/05 22:03:57 mbr Exp $
- * $DragonFly: src/sys/dev/netif/ste/if_ste.c,v 1.18 2005/05/24 20:59:02 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/ste/if_ste.c,v 1.19 2005/05/27 15:36:10 joerg Exp $
  */
 
 #include <sys/param.h>
@@ -1411,11 +1411,6 @@ static int ste_ioctl(ifp, command, data, cr)
 	ifr = (struct ifreq *)data;
 
 	switch(command) {
-	case SIOCSIFADDR:
-	case SIOCGIFADDR:
-	case SIOCSIFMTU:
-		error = ether_ioctl(ifp, command, data);
-		break;
 	case SIOCSIFFLAGS:
 		if (ifp->if_flags & IFF_UP) {
 			if (ifp->if_flags & IFF_RUNNING &&
@@ -1451,7 +1446,7 @@ static int ste_ioctl(ifp, command, data, cr)
 		error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, command);
 		break;
 	default:
-		error = EINVAL;
+		error = ether_ioctl(ifp, command, data);
 		break;
 	}
 
diff --git a/sys/dev/netif/ti/if_ti.c b/sys/dev/netif/ti/if_ti.c
index d6b8a6b3b1..da644f7bac 100644
--- a/sys/dev/netif/ti/if_ti.c
+++ b/sys/dev/netif/ti/if_ti.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_ti.c,v 1.25.2.14 2002/02/15 04:20:20 silby Exp $
- * $DragonFly: src/sys/dev/netif/ti/if_ti.c,v 1.21 2005/05/24 20:59:02 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/ti/if_ti.c,v 1.22 2005/05/27 15:36:10 joerg Exp $
  */
 
 /*
@@ -2376,10 +2376,6 @@ static int ti_ioctl(ifp, command, data, cr)
 	s = splimp();
 
 	switch(command) {
-	case SIOCSIFADDR:
-	case SIOCGIFADDR:
-		error = ether_ioctl(ifp, command, data);
-		break;
 	case SIOCSIFMTU:
 		if (ifr->ifr_mtu > TI_JUMBO_MTU)
 			error = EINVAL;
@@ -2442,7 +2438,7 @@ static int ti_ioctl(ifp, command, data, cr)
 		error = 0;
 		break;
 	default:
-		error = EINVAL;
+		error = ether_ioctl(ifp, command, data);
 		break;
 	}
 
diff --git a/sys/dev/netif/tl/if_tl.c b/sys/dev/netif/tl/if_tl.c
index 9f0f8670c0..3c61af6672 100644
--- a/sys/dev/netif/tl/if_tl.c
+++ b/sys/dev/netif/tl/if_tl.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_tl.c,v 1.51.2.5 2001/12/16 15:46:08 luigi Exp $
- * $DragonFly: src/sys/dev/netif/tl/if_tl.c,v 1.19 2005/05/24 20:59:02 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/tl/if_tl.c,v 1.20 2005/05/27 15:36:10 joerg Exp $
  */
 
 /*
@@ -2157,11 +2157,6 @@ static int tl_ioctl(ifp, command, data, cr)
 	s = splimp();
 
 	switch(command) {
-	case SIOCSIFADDR:
-	case SIOCGIFADDR:
-	case SIOCSIFMTU:
-		error = ether_ioctl(ifp, command, data);
-		break;
 	case SIOCSIFFLAGS:
 		if (ifp->if_flags & IFF_UP) {
 			if (ifp->if_flags & IFF_RUNNING &&
@@ -2201,7 +2196,7 @@ static int tl_ioctl(ifp, command, data, cr)
 		}
 		break;
 	default:
-		error = EINVAL;
+		error = ether_ioctl(ifp, command, data);
 		break;
 	}
 
diff --git a/sys/dev/netif/tx/if_tx.c b/sys/dev/netif/tx/if_tx.c
index 99cccdaa9e..ce1e689939 100644
--- a/sys/dev/netif/tx/if_tx.c
+++ b/sys/dev/netif/tx/if_tx.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/tx/if_tx.c,v 1.61.2.1 2002/10/29 01:43:49 semenu Exp $
- * $DragonFly: src/sys/dev/netif/tx/if_tx.c,v 1.18 2005/05/24 20:59:02 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/tx/if_tx.c,v 1.19 2005/05/27 15:36:10 joerg Exp $
  */
 
 /*
@@ -413,10 +413,6 @@ epic_ifioctl(ifp, command, data, cr)
 	x = splimp();
 
 	switch (command) {
-	case SIOCSIFADDR:
-	case SIOCGIFADDR:
-		error = ether_ioctl(ifp, command, data);
-		break;
 	case SIOCSIFMTU:
 		if (ifp->if_mtu == ifr->ifr_mtu)
 			break;
@@ -472,7 +468,8 @@ epic_ifioctl(ifp, command, data, cr)
 		break;
 
 	default:
-		error = EINVAL;
+		error = ether_ioctl(ifp, command, data);
+		break;
 	}
 	splx(x);
 
diff --git a/sys/dev/netif/vr/if_vr.c b/sys/dev/netif/vr/if_vr.c
index 3ae3cbd97b..adf0c820dc 100644
--- a/sys/dev/netif/vr/if_vr.c
+++ b/sys/dev/netif/vr/if_vr.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_vr.c,v 1.26.2.13 2003/02/06 04:46:20 silby Exp $
- * $DragonFly: src/sys/dev/netif/vr/if_vr.c,v 1.23 2005/05/25 01:44:31 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/vr/if_vr.c,v 1.24 2005/05/27 15:36:10 joerg Exp $
  */
 
 /*
@@ -1575,11 +1575,6 @@ vr_ioctl(struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr)
 	s = splimp();
 
 	switch(command) {
-	case SIOCSIFADDR:
-	case SIOCGIFADDR:
-	case SIOCSIFMTU:
-		error = ether_ioctl(ifp, command, data);
-		break;
 	case SIOCSIFFLAGS:
 		if (ifp->if_flags & IFF_UP) {
 			vr_init(sc);
@@ -1600,7 +1595,7 @@ vr_ioctl(struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr)
 		error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, command);
 		break;
 	default:
-		error = EINVAL;
+		error = ether_ioctl(ifp, command, data);
 		break;
 	}
 
diff --git a/sys/dev/netif/vx/if_vx.c b/sys/dev/netif/vx/if_vx.c
index 39a8dcae97..86e2429fa4 100644
--- a/sys/dev/netif/vx/if_vx.c
+++ b/sys/dev/netif/vx/if_vx.c
@@ -28,7 +28,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/vx/if_vx.c,v 1.25.2.6 2002/02/13 00:43:10 dillon Exp $
- * $DragonFly: src/sys/dev/netif/vx/if_vx.c,v 1.16 2005/02/20 03:53:42 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/vx/if_vx.c,v 1.17 2005/05/27 15:36:10 joerg Exp $
  *
  */
 
@@ -839,11 +839,6 @@ vxioctl(ifp, cmd, data, cr)
     s = splimp();
 
     switch (cmd) {
-    case SIOCSIFADDR:
-    case SIOCGIFADDR:
-	ether_ioctl(ifp, cmd, data);
-	break;
-
     case SIOCSIFFLAGS:
 	if ((ifp->if_flags & IFF_UP) == 0 &&
 	    (ifp->if_flags & IFF_RUNNING) != 0) {
@@ -894,7 +889,8 @@ vxioctl(ifp, cmd, data, cr)
 
 
     default:
-        error = EINVAL;
+	ether_ioctl(ifp, cmd, data);
+	break;
     }
 
     splx(s);
diff --git a/sys/dev/netif/wb/if_wb.c b/sys/dev/netif/wb/if_wb.c
index 22e0af46b7..b023ee396e 100644
--- a/sys/dev/netif/wb/if_wb.c
+++ b/sys/dev/netif/wb/if_wb.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_wb.c,v 1.26.2.6 2003/03/05 18:42:34 njl Exp $
- * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.19 2005/05/24 20:59:03 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.20 2005/05/27 15:36:10 joerg Exp $
  */
 
 /*
@@ -1736,11 +1736,6 @@ static int wb_ioctl(ifp, command, data, cr)
 	s = splimp();
 
 	switch(command) {
-	case SIOCSIFADDR:
-	case SIOCGIFADDR:
-	case SIOCSIFMTU:
-		error = ether_ioctl(ifp, command, data);
-		break;
 	case SIOCSIFFLAGS:
 		if (ifp->if_flags & IFF_UP) {
 			wb_init(sc);
@@ -1761,7 +1756,7 @@ static int wb_ioctl(ifp, command, data, cr)
 		error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, command);
 		break;
 	default:
-		error = EINVAL;
+		error = ether_ioctl(ifp, command, data);
 		break;
 	}
 
diff --git a/sys/dev/netif/wl/if_wl.c b/sys/dev/netif/wl/if_wl.c
index 2b8d008563..8b6bcf2ebf 100644
--- a/sys/dev/netif/wl/if_wl.c
+++ b/sys/dev/netif/wl/if_wl.c
@@ -1,5 +1,5 @@
 /* $FreeBSD: src/sys/i386/isa/if_wl.c,v 1.27.2.2 2000/07/17 21:24:32 archie Exp $ */
-/* $DragonFly: src/sys/dev/netif/wl/if_wl.c,v 1.17 2005/02/20 03:58:04 joerg Exp $ */
+/* $DragonFly: src/sys/dev/netif/wl/if_wl.c,v 1.18 2005/05/27 15:36:10 joerg Exp $ */
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -1148,12 +1148,6 @@ wlioctl(struct ifnet *ifp, u_long cmd, caddr_t data, struct ucred *cred)
 #endif
     opri = splimp();
     switch (cmd) {
-    case SIOCSIFADDR:
-    case SIOCGIFADDR:
-    case SIOCSIFMTU:
-        error = ether_ioctl(ifp, cmd, data);
-        break;
-
     case SIOCSIFFLAGS:
 	if (ifp->if_flags & IFF_ALLMULTI) {
 	    mode |= MOD_ENAL;
@@ -1378,7 +1372,8 @@ wlioctl(struct ifnet *ifp, u_long cmd, caddr_t data, struct ucred *cred)
 #endif
 
     default:
-	error = EINVAL;
+        error = ether_ioctl(ifp, cmd, data);
+        break;
     }
     splx(opri);
     return (error);
diff --git a/sys/dev/netif/xe/if_xe.c b/sys/dev/netif/xe/if_xe.c
index 8e0f5738f8..1de7aa90ca 100644
--- a/sys/dev/netif/xe/if_xe.c
+++ b/sys/dev/netif/xe/if_xe.c
@@ -25,7 +25,7 @@
  *
  *	$Id: if_xe.c,v 1.20 1999/06/13 19:17:40 scott Exp $
  * $FreeBSD: src/sys/dev/xe/if_xe.c,v 1.13.2.6 2003/02/05 22:03:57 mbr Exp $
- * $DragonFly: src/sys/dev/netif/xe/if_xe.c,v 1.18 2005/05/24 20:59:03 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/xe/if_xe.c,v 1.19 2005/05/27 15:36:10 joerg Exp $
  */
 
 /*
@@ -732,12 +732,6 @@ xe_ioctl (struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr) {
 
   switch (command) {
 
-   case SIOCSIFADDR:
-   case SIOCGIFADDR:
-   case SIOCSIFMTU:
-    error = ether_ioctl(ifp, command, data);
-    break;
-
    case SIOCSIFFLAGS:
     /*
      * If the interface is marked up and stopped, then start it.  If it is
@@ -775,7 +769,8 @@ xe_ioctl (struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr) {
     break;
 
    default:
-    error = EINVAL;
+    error = ether_ioctl(ifp, command, data);
+    break;
   }
 
   (void)splx(s);
diff --git a/sys/dev/netif/xl/if_xl.c b/sys/dev/netif/xl/if_xl.c
index fb6f25f2e9..6b88f7ddce 100644
--- a/sys/dev/netif/xl/if_xl.c
+++ b/sys/dev/netif/xl/if_xl.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_xl.c,v 1.72.2.28 2003/10/08 06:01:57 murray Exp $
- * $DragonFly: src/sys/dev/netif/xl/if_xl.c,v 1.22 2005/05/24 20:59:03 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/xl/if_xl.c,v 1.23 2005/05/27 15:36:10 joerg Exp $
  */
 
 /*
@@ -3094,11 +3094,6 @@ xl_ioctl(ifp, command, data, cr)
 	s = splimp();
 
 	switch(command) {
-	case SIOCSIFADDR:
-	case SIOCGIFADDR:
-	case SIOCSIFMTU:
-		error = ether_ioctl(ifp, command, data);
-		break;
 	case SIOCSIFFLAGS:
 		XL_SEL_WIN(5);
 		rxfilt = CSR_READ_1(sc, XL_W5_RX_FILTER);
@@ -3153,7 +3148,7 @@ xl_ioctl(ifp, command, data, cr)
 			ifp->if_hwassist = 0;
 		break;
 	default:
-		error = EINVAL;
+		error = ether_ioctl(ifp, command, data);
 		break;
 	}
 
-- 
2.41.0