Date: Wed, 28 Jan 2009 19:36:09 +0000 (UTC) From: Sam Leffler <sam@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r187850 - in projects/vap7/sys: . contrib/pf dev dev/ath dev/ath/ath_hal dev/ath/ath_hal/ar5210 dev/ath/ath_hal/ar5211 dev/ath/ath_hal/ar5212 dev/ath/ath_hal/ar5312 dev/ath/ath_hal/ar54... Message-ID: <200901281936.n0SJa9Tm030761@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sam Date: Wed Jan 28 19:36:09 2009 New Revision: 187850 URL: http://svn.freebsd.org/changeset/base/187850 Log: merge r187611: fix return status handling by ar5XXXReset Modified: projects/vap7/sys/ (props changed) projects/vap7/sys/contrib/pf/ (props changed) projects/vap7/sys/dev/ (props changed) projects/vap7/sys/dev/ath/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5210/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c projects/vap7/sys/dev/ath/ath_hal/ar5211/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c projects/vap7/sys/dev/ath/ath_hal/ar5212/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c projects/vap7/sys/dev/ath/ath_hal/ar5312/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c projects/vap7/sys/dev/ath/ath_hal/ar5416/ (props changed) projects/vap7/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c projects/vap7/sys/dev/cxgb/ (props changed) projects/vap7/sys/dev/usb2/ (props changed) projects/vap7/sys/i386/conf/USB2 (props changed) projects/vap7/sys/modules/usb2/ (props changed) projects/vap7/sys/net80211/ (props changed) Modified: projects/vap7/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c ============================================================================== --- projects/vap7/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c Wed Jan 28 19:35:26 2009 (r187849) +++ projects/vap7/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c Wed Jan 28 19:36:09 2009 (r187850) @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5210_reset.c,v 1.8 2008/11/11 17:25:16 sam Exp $ + * $FreeBSD$ */ #include "opt_ah.h" @@ -296,7 +296,7 @@ ar5210Reset(struct ath_hal *ah, HAL_OPMO return AH_TRUE; bad: - if (*status) + if (status != AH_NULL) *status = ecode; return AH_FALSE; #undef FAIL Modified: projects/vap7/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c ============================================================================== --- projects/vap7/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c Wed Jan 28 19:35:26 2009 (r187849) +++ projects/vap7/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c Wed Jan 28 19:36:09 2009 (r187850) @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5211_reset.c,v 1.9 2008/11/27 22:29:52 sam Exp $ + * $FreeBSD$ */ #include "opt_ah.h" @@ -552,7 +552,7 @@ uint32_t softLedCfg, softLedState; return AH_TRUE; bad: - if (*status) + if (status != AH_NULL) *status = ecode; return AH_FALSE; #undef FAIL Modified: projects/vap7/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c ============================================================================== --- projects/vap7/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c Wed Jan 28 19:35:26 2009 (r187849) +++ projects/vap7/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c Wed Jan 28 19:36:09 2009 (r187850) @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5212_reset.c,v 1.20 2008/11/27 22:30:00 sam Exp $ + * $FreeBSD$ */ #include "opt_ah.h" @@ -692,7 +692,7 @@ bad: RESTORE_CCK(ah, chan, isBmode); OS_MARK(ah, AH_MARK_RESET_DONE, ecode); - if (*status) + if (status != AH_NULL) *status = ecode; return AH_FALSE; #undef FAIL Modified: projects/vap7/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c ============================================================================== --- projects/vap7/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c Wed Jan 28 19:35:26 2009 (r187849) +++ projects/vap7/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c Wed Jan 28 19:36:09 2009 (r187850) @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5312_reset.c,v 1.10 2008/11/22 07:41:37 sam Exp $ + * $FreeBSD$ */ #include "opt_ah.h" @@ -597,7 +597,7 @@ ar5312Reset(struct ath_hal *ah, HAL_OPMO return AH_TRUE; bad: OS_MARK(ah, AH_MARK_RESET_DONE, ecode); - if (*status) + if (status != AH_NULL) *status = ecode; return AH_FALSE; #undef FAIL Modified: projects/vap7/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c ============================================================================== --- projects/vap7/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Wed Jan 28 19:35:26 2009 (r187849) +++ projects/vap7/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Wed Jan 28 19:36:09 2009 (r187850) @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: ar5416_reset.c,v 1.27 2008/11/27 22:30:08 sam Exp $ + * $FreeBSD$ */ #include "opt_ah.h" @@ -470,7 +470,7 @@ ar5416Reset(struct ath_hal *ah, HAL_OPMO return AH_TRUE; bad: OS_MARK(ah, AH_MARK_RESET_DONE, ecode); - if (*status) + if (status != AH_NULL) *status = ecode; return AH_FALSE; #undef FAIL
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200901281936.n0SJa9Tm030761>