diff options
Diffstat (limited to 'sys/dev/usb/if_axe.c')
| -rw-r--r-- | sys/dev/usb/if_axe.c | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c index ab00e05ed9d..62af3637512 100644 --- a/sys/dev/usb/if_axe.c +++ b/sys/dev/usb/if_axe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_axe.c,v 1.90 2008/11/06 02:32:28 brad Exp $ */ +/* $OpenBSD: if_axe.c,v 1.91 2008/11/28 02:44:18 brad Exp $ */ /* * Copyright (c) 2005, 2006, 2007 Jonathan Gray <jsg@openbsd.org> @@ -1352,13 +1352,6 @@ axe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) #endif break; - case SIOCSIFMTU: - if (ifr->ifr_mtu < ETHERMIN || ifr->ifr_mtu > ifp->if_hardmtu) - error = EINVAL; - else if (ifp->if_mtu != ifr->ifr_mtu) - ifp->if_mtu = ifr->ifr_mtu; - break; - case SIOCSIFFLAGS: if (ifp->if_flags & IFF_UP) { if (ifp->if_flags & IFF_RUNNING && @@ -1385,22 +1378,7 @@ axe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) } sc->axe_if_flags = ifp->if_flags; break; - case SIOCADDMULTI: - case SIOCDELMULTI: - error = (cmd == SIOCADDMULTI) ? - ether_addmulti(ifr, &sc->arpcom) : - ether_delmulti(ifr, &sc->arpcom); - - if (error == ENETRESET) { - /* - * Multicast list has changed; set the hardware - * filter accordingly. - */ - if (ifp->if_flags & IFF_RUNNING) - axe_setmulti(sc); - error = 0; - } - break; + case SIOCGIFMEDIA: case SIOCSIFMEDIA: mii = GET_MII(sc); @@ -1411,6 +1389,12 @@ axe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) error = ether_ioctl(ifp, &sc->arpcom, cmd, data); } + if (error == ENETRESET) { + if (ifp->if_flags & IFF_RUNNING) + axe_setmulti(sc); + error = 0; + } + splx(s); return(error); } |