diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2008-11-28 02:44:19 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2008-11-28 02:44:19 +0000 |
| commit | 7da313a2f65e39b86488c21555c356ca3a9100e5 (patch) | |
| tree | 391b806058ca43cb3ba624dce63764bce2b9b2b1 /sys/dev/ic/i82596.c | |
| parent | 37778efb0de37bd00e9269e32ac772f743cce430 (diff) | |
Eliminate the redundant bits of code for MTU and multicast handling
from the individual drivers now that ether_ioctl() handles this.
Shrinks the i386 kernels by..
RAMDISK - 2176 bytes
RAMDISKB - 1504 bytes
RAMDISKC - 736 bytes
Tested by naddy@/okan@/sthen@/brad@/todd@/jmc@ and lots of users.
Build tested on almost all archs by todd@/brad@
ok naddy@
Diffstat (limited to 'sys/dev/ic/i82596.c')
| -rw-r--r-- | sys/dev/ic/i82596.c | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/sys/dev/ic/i82596.c b/sys/dev/ic/i82596.c index ef7d86432c2..29e4a07d01e 100644 --- a/sys/dev/ic/i82596.c +++ b/sys/dev/ic/i82596.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i82596.c,v 1.31 2008/10/03 00:19:55 brad Exp $ */ +/* $OpenBSD: i82596.c,v 1.32 2008/11/28 02:44:17 brad Exp $ */ /* $NetBSD: i82586.c,v 1.18 1998/08/15 04:42:42 mycroft Exp $ */ /*- @@ -1920,23 +1920,6 @@ i82596_ioctl(ifp, cmd, data) #endif break; - case SIOCADDMULTI: - case SIOCDELMULTI: - error = (cmd == SIOCADDMULTI) ? - ether_addmulti(ifr, &sc->sc_arpcom): - ether_delmulti(ifr, &sc->sc_arpcom); - - if (error == ENETRESET) { - /* - * Multicast list has changed; set the hardware filter - * accordingly. - */ - if (ifp->if_flags & IFF_RUNNING) - ie_mc_reset(sc); - error = 0; - } - break; - case SIOCGIFMEDIA: case SIOCSIFMEDIA: error = ifmedia_ioctl(ifp, ifr, &sc->sc_media, cmd); @@ -1946,6 +1929,12 @@ i82596_ioctl(ifp, cmd, data) error = ether_ioctl(ifp, &sc->sc_arpcom, cmd, data); } + if (error == ENETRESET) { + if (ifp->if_flags & IFF_RUNNING) + ie_mc_reset(sc); + error = 0; + } + splx(s); return (error); } |