From owner-svn-src-head@FreeBSD.ORG  Sat Jan 11 14:48:17 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6AAD3669;
 Sat, 11 Jan 2014 14:48:17 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 56D38179B;
 Sat, 11 Jan 2014 14:48:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0BEmHbu097992;
 Sat, 11 Jan 2014 14:48:17 GMT (envelope-from kevlo@svn.freebsd.org)
Received: (from kevlo@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0BEmHEx097991;
 Sat, 11 Jan 2014 14:48:17 GMT (envelope-from kevlo@svn.freebsd.org)
Message-Id: <201401111448.s0BEmHEx097991@svn.freebsd.org>
From: Kevin Lo <kevlo@FreeBSD.org>
Date: Sat, 11 Jan 2014 14:48:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r260542 - head/sys/dev/usb/wlan
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Jan 2014 14:48:17 -0000

Author: kevlo
Date: Sat Jan 11 14:48:16 2014
New Revision: 260542
URL: http://svnweb.freebsd.org/changeset/base/260542

Log:
  Fix a logic error when checking if Tx power entries are greater than 31.

Modified:
  head/sys/dev/usb/wlan/if_run.c

Modified: head/sys/dev/usb/wlan/if_run.c
==============================================================================
--- head/sys/dev/usb/wlan/if_run.c	Sat Jan 11 13:35:36 2014	(r260541)
+++ head/sys/dev/usb/wlan/if_run.c	Sat Jan 11 14:48:16 2014	(r260542)
@@ -1650,12 +1650,12 @@ run_rt3593_get_txpower(struct run_softc 
 	}
 	/* Fix broken Tx power entries. */
 	for (i = 0; i < 14; i++) {
-		if ((sc->txpow1[i] & 0x1f) > 31)
+		if (sc->txpow1[i] > 31)
 			sc->txpow1[i] = 5;
-		if ((sc->txpow2[i] & 0x1f) > 31)
+		if (sc->txpow2[i] > 31)
 			sc->txpow2[i] = 5;
 		if (sc->ntxchains == 3) {
-			if ((sc->txpow3[i] & 0x1f) > 31)
+			if (sc->txpow3[i] > 31)
 				sc->txpow3[i] = 5;
 		}
 	}