svn commit: r187611 - in head/sys/dev/ath/ath_hal: ar5210 ar5211
ar5212 ar5312 ar5416
Sam Leffler
sam at FreeBSD.org
Thu Jan 22 21:33:49 PST 2009
Author: sam
Date: Fri Jan 23 05:33:48 2009
New Revision: 187611
URL: http://svn.freebsd.org/changeset/base/187611
Log:
fix return status handling by ar5XXXReset; this is the reason the
driver sometimes reports reset failed w/ status 0
Modified:
head/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c
head/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c
head/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c
head/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c
head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
Modified: head/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c Fri Jan 23 05:04:49 2009 (r187610)
+++ head/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c Fri Jan 23 05:33:48 2009 (r187611)
@@ -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: head/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c Fri Jan 23 05:04:49 2009 (r187610)
+++ head/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c Fri Jan 23 05:33:48 2009 (r187611)
@@ -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: head/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c Fri Jan 23 05:04:49 2009 (r187610)
+++ head/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c Fri Jan 23 05:33:48 2009 (r187611)
@@ -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: head/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c Fri Jan 23 05:04:49 2009 (r187610)
+++ head/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c Fri Jan 23 05:33:48 2009 (r187611)
@@ -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: head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Fri Jan 23 05:04:49 2009 (r187610)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Fri Jan 23 05:33:48 2009 (r187611)
@@ -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
More information about the svn-src-head
mailing list