summaryrefslogtreecommitdiff
path: root/sys/arch/mvme88k
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2008-10-02 20:21:16 +0000
committerBrad Smith <brad@cvs.openbsd.org>2008-10-02 20:21:16 +0000
commit8d3b73e0ab70c1110b5b479b02809b80891945cc (patch)
tree6f9f4aecd17358436877da1307c753e5db774045 /sys/arch/mvme88k
parent6d6833da157e83635382235a3f52b938de757cc4 (diff)
First step towards cleaning up the Ethernet driver ioctl handling.
Move calling ether_ioctl() from the top of the ioctl function, which at the moment does absolutely nothing, to the default switch case. Thus allowing drivers to define their own ioctl handlers and then falling back on ether_ioctl(). The only functional change this results in at the moment is having all Ethernet drivers returning the proper errno of ENOTTY instead of EINVAL/ENXIO when encountering unknown ioctl's. Shrinks the i386 kernels by.. RAMDISK - 1024 bytes RAMDISKB - 1120 bytes RAMDISKC - 832 bytes Tested by martin@/jsing@/todd@/brad@ Build tested on almost all archs by todd@/brad@ ok jsing@
Diffstat (limited to 'sys/arch/mvme88k')
-rw-r--r--sys/arch/mvme88k/dev/if_ie.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/sys/arch/mvme88k/dev/if_ie.c b/sys/arch/mvme88k/dev/if_ie.c
index 107cb65fcbe..fc20ea22c19 100644
--- a/sys/arch/mvme88k/dev/if_ie.c
+++ b/sys/arch/mvme88k/dev/if_ie.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ie.c,v 1.41 2006/05/08 14:36:10 miod Exp $ */
+/* $OpenBSD: if_ie.c,v 1.42 2008/10/02 20:21:13 brad Exp $ */
/*-
* Copyright (c) 1998 Steve Murphree, Jr.
@@ -1794,13 +1794,7 @@ ieioctl(ifp, cmd, data)
s = splnet();
- if ((error = ether_ioctl(ifp, &sc->sc_arpcom, cmd, data)) > 0) {
- splx(s);
- return error;
- }
-
switch(cmd) {
-
case SIOCSIFADDR:
ifp->if_flags |= IFF_UP;
@@ -1868,8 +1862,9 @@ ieioctl(ifp, cmd, data)
break;
default:
- error = EINVAL;
+ error = ether_ioctl(ifp, &sc->sc_arpcom, cmd, data);
}
+
splx(s);
return error;
}