diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-11-29 10:24:34 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-11-29 10:24:34 +0000 |
| commit | 958f5e3ff56745212e45e0b60388bfeddaf75dc3 (patch) | |
| tree | 24738f9d8b54354e708158b2e0485d1318744227 /sys/dev | |
| parent | 3d7b0e739bfd4b898810062007e9797a0882bfea (diff) | |
Fix damage done by brad@ and dlg@.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/if_cdcef.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/usb/if_cdcef.c b/sys/dev/usb/if_cdcef.c index 2b12a61f5a0..f934988c1ec 100644 --- a/sys/dev/usb/if_cdcef.c +++ b/sys/dev/usb/if_cdcef.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cdcef.c,v 1.22 2008/11/28 02:44:18 brad Exp $ */ +/* $OpenBSD: if_cdcef.c,v 1.23 2008/11/29 10:24:33 matthieu Exp $ */ /* * Copyright (c) 2007 Dale Rahn <drahn@openbsd.org> @@ -126,6 +126,8 @@ struct usbf_function_methods cdcef_methods = { #define DEVNAME(sc) ((sc)->sc_dev.bdev.dv_xname) +extern int ticks; + /* * USB function match/attach/detach */ @@ -473,7 +475,6 @@ cdcef_ioctl(struct ifnet *ifp, u_long command, caddr_t data) { struct cdcef_softc *sc = ifp->if_softc; struct ifaddr *ifa = (struct ifaddr *)data; - struct ifreq *ifr = (struct ifreq *)data; int s, error = 0; s = splnet(); @@ -504,7 +505,7 @@ cdcef_ioctl(struct ifnet *ifp, u_long command, caddr_t data) error = ether_ioctl(ifp, &sc->sc_arpcom, command, data); } - if (error = ENETRESET) + if (error == ENETRESET) error = 0; splx(s); |