diff options
| author | Constantine A. Murenin <cnst@cvs.openbsd.org> | 2008-12-03 14:47:18 +0000 |
|---|---|---|
| committer | Constantine A. Murenin <cnst@cvs.openbsd.org> | 2008-12-03 14:47:18 +0000 |
| commit | 15cc6c774ac4d19ba0706c9f7566e2433c855f03 (patch) | |
| tree | 1c601b5c6745f82633eb48422f66f8a4e57657a3 | |
| parent | 038019a65f7cefd0fb6f6e543af041df8ac7af8b (diff) | |
don't overwrite an error code from wpi_init() in wpi_ioctl(), logic is
now in line with iwn_ioctl(); 'dead assignment' llvm/clang; ok damien
| -rw-r--r-- | sys/dev/pci/if_wpi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c index 6e32ad56161..576c0394315 100644 --- a/sys/dev/pci/if_wpi.c +++ b/sys/dev/pci/if_wpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wpi.c,v 1.76 2008/11/25 22:20:11 damien Exp $ */ +/* $OpenBSD: if_wpi.c,v 1.77 2008/12/03 14:47:17 cnst Exp $ */ /*- * Copyright (c) 2006-2008 @@ -2039,12 +2039,12 @@ wpi_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) } if (error == ENETRESET) { + error = 0; if ((ifp->if_flags & (IFF_UP | IFF_RUNNING)) == (IFF_UP | IFF_RUNNING)) { wpi_stop(ifp, 0); error = wpi_init(ifp); } - error = 0; } splx(s); |