From owner-svn-src-head@FreeBSD.ORG  Fri Dec  6 16:22:53 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4A4C1598;
 Fri,  6 Dec 2013 16:22:53 +0000 (UTC)
Received: from ns.kevlo.org (220-135-115-6.HINET-IP.hinet.net [220.135.115.6])
 (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 D87011B27;
 Fri,  6 Dec 2013 16:22:52 +0000 (UTC)
Received: from [127.0.0.1] (mail.kevlo.org [220.135.115.6])
 by ns.kevlo.org (8.14.6/8.14.6) with ESMTP id rB6GLYdp099776;
 Sat, 7 Dec 2013 00:21:35 +0800 (CST)
 (envelope-from kevlo@FreeBSD.org)
Message-ID: <52A1F9DA.8000500@FreeBSD.org>
Date: Sat, 07 Dec 2013 00:22:50 +0800
From: Kevin Lo <kevlo@FreeBSD.org>
User-Agent: Mozilla/5.0 (X11; Linux x86_64;
 rv:24.0) Gecko/20100101 Thunderbird/24.1.1
MIME-Version: 1.0
To: John Baldwin <jhb@freebsd.org>
Subject: Re: svn commit: r259031 - head/sys/dev/usb/wlan
References: <201312061517.rB6FHTOa007535@svn.freebsd.org>
 <201312061027.09144.jhb@freebsd.org>
In-Reply-To: <201312061027.09144.jhb@freebsd.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
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: Fri, 06 Dec 2013 16:22:53 -0000

  John Baldwin wrote:
> On Friday, December 06, 2013 10:17:29 am Kevin Lo wrote:
>> Author: kevlo
>> Date: Fri Dec  6 15:17:28 2013
>> New Revision: 259031
>> URL: http://svnweb.freebsd.org/changeset/base/259031
>>
>> Log:
>>    Replace the magic numbers with something more readable.
>>
>> Modified:
>>    head/sys/dev/usb/wlan/if_run.c
>>    head/sys/dev/usb/wlan/if_runreg.h
>>
>> Modified: head/sys/dev/usb/wlan/if_run.c
>>
> ==============================================================================
>> --- head/sys/dev/usb/wlan/if_run.c	Fri Dec  6 15:15:58 2013	(r259030)
>> +++ head/sys/dev/usb/wlan/if_run.c	Fri Dec  6 15:17:28 2013	(r259031)
>> @@ -4530,7 +4530,7 @@ run_rt5390_bbp_init(struct run_softc *sc
>>   
>>   	/* Avoid data lost and CRC error. */
>>   	run_bbp_read(sc, 4, &bbp4);
>> -	run_bbp_write(sc, 4, bbp4 | 0x40);
>> +	run_bbp_write(sc, 4, bbp | RT5390_MAC_IF_CTRL);
> The s/bbp4/bbp/ here looks like a bug?

Something went wrong with the merge.  Fixed as r259032.

     Kevin