Date: Sun, 16 Mar 2008 03:52:53 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 137823 for review Message-ID: <200803160352.m2G3qr9X017250@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=137823 Change 137823 by sam@sam_ebb on 2008/03/16 03:52:37 must call iv_reset before checking ENETRESET so the default method can return it and force the legacy path Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#44 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#44 (text+ko) ==== @@ -3311,14 +3311,14 @@ * reload of the hardware state but not a complete re-init; * in that case we use the iv_reset callback. If a device * does not fillin iv_reset then it defaults to one that - * calls the init method--which may be suboptimal. + * returns ENETRESET--which may be suboptimal. */ + if (error == ERESTART) + error = IFNET_IS_UP_RUNNING(ifp) ? vap->iv_reset(vap, cmd) : 0; if (error == ENETRESET) { if (IFNET_IS_UP_RUNNING(ifp)) ieee80211_init(vap); error = 0; - } else if (error == ERESTART) { - error = IFNET_IS_UP_RUNNING(ifp) ? vap->iv_reset(vap, cmd) : 0; } return error; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200803160352.m2G3qr9X017250>