From owner-svn-src-projects@FreeBSD.ORG Wed Jan 28 19:36:10 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0CF381065700; Wed, 28 Jan 2009 19:36:10 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E89018FC0C; Wed, 28 Jan 2009 19:36:09 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0SJa9XR030766; Wed, 28 Jan 2009 19:36:09 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0SJa9Tm030761; Wed, 28 Jan 2009 19:36:09 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200901281936.n0SJa9Tm030761@svn.freebsd.org> From: Sam Leffler Date: Wed, 28 Jan 2009 19:36:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: 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... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jan 2009 19:36:15 -0000 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