Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not return EINPROGRESS but 0 in awi_newstate, since the EINPROGRESS

Browse Source 
handling was changed in net80211 framework.
This fix wiconfig -D awi0 to work again for DS phys.
XXX FH phys takes 20 seconds to complete scan, so wiconfig timed out.
This commit is contained in:
onoe 2004-01-16 14:13:15 +00:00
parent 61921570d3
commit a42258dab0
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/dev/ic/awi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: awi.c,v 1.61 2004/01/15 13:29:05 onoe Exp $ */ /* $NetBSD: awi.c,v 1.62 2004/01/16 14:13:15 onoe Exp $ */
/*- /*-
* Copyright (c) 1999,2000,2001 The NetBSD Foundation, Inc. * Copyright (c) 1999,2000,2001 The NetBSD Foundation, Inc.
@ -86,10 +86,10 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifdef __NetBSD__ #ifdef __NetBSD__
__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.61 2004/01/15 13:29:05 onoe Exp $"); __KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.62 2004/01/16 14:13:15 onoe Exp $");
#endif #endif
#ifdef __FreeBSD__ #ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/sys/dev/awi/awi.c,v 1.29 2004/01/15 10:04:20 onoe Exp $"); __FBSDID("$FreeBSD: src/sys/dev/awi/awi.c,v 1.30 2004/01/15 13:30:06 onoe Exp $");
#endif #endif
#include "opt_inet.h" #include "opt_inet.h"
@ -2086,8 +2086,11 @@ awi_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg)
return (*sc->sc_newstate)(ic, nstate, arg); return (*sc->sc_newstate)(ic, nstate, arg);
out: out:
if (error != 0) if (error != 0) {
if (error == EINPROGRESS)
error = 0;
return error; return error;
}
return (*sc->sc_newstate)(ic, nstate, arg); return (*sc->sc_newstate)(ic, nstate, arg);
} }