From owner-p4-projects@FreeBSD.ORG  Thu Jan  8 04:58:29 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0782A106566C; Thu,  8 Jan 2009 04:58:29 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B2276106564A
	for <perforce@FreeBSD.org>; Thu,  8 Jan 2009 04:58:28 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A0BE38FC08
	for <perforce@FreeBSD.org>; Thu,  8 Jan 2009 04:58:28 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n084wSAg042755
	for <perforce@FreeBSD.org>; Thu, 8 Jan 2009 04:58:28 GMT
	(envelope-from weongyo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n084wS3T042753
	for perforce@freebsd.org; Thu, 8 Jan 2009 04:58:28 GMT
	(envelope-from weongyo@FreeBSD.org)
Date: Thu, 8 Jan 2009 04:58:28 GMT
Message-Id: <200901080458.n084wS3T042753@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	weongyo@FreeBSD.org using -f
From: Weongyo Jeong <weongyo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 155801 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jan 2009 04:58:30 -0000

http://perforce.freebsd.org/chv.cgi?CH=155801

Change 155801 by weongyo@weongyo_ws on 2009/01/08 04:58:16

	check the value directly.

Affected files ...

.. //depot/projects/vap/sys/dev/usb/if_urtw.c#15 edit

Differences ...

==== //depot/projects/vap/sys/dev/usb/if_urtw.c#15 (text+ko) ====

@@ -2770,7 +2770,6 @@
 {
 	struct ieee80211com *ic = sc->sc_ifp->if_l2com;
 	struct ieee80211_channel *c = ic->ic_curchan;
-	short gset = (IEEE80211_IS_CHAN_G(c)) ? 1 : 0;
 	usbd_status error;
 
 	error = urtw_8225_set_txpwrlvl(sc, chan);
@@ -2787,7 +2786,7 @@
 	else
 		urtw_write8_m(sc, URTW_SLOT, 0x14);
 	
-	if (gset) {
+	if (IEEE80211_IS_CHAN_G(c)) {
 		/* for G */
 		urtw_write8_m(sc, URTW_DIFS, 0x14);
 		urtw_write8_m(sc, URTW_EIFS, 0x5b - 0x14);
@@ -3177,7 +3176,6 @@
 {
 	struct ieee80211com *ic = sc->sc_ifp->if_l2com;
 	struct ieee80211_channel *c = ic->ic_curchan;
-	short gset = (IEEE80211_IS_CHAN_G(c)) ? 1 : 0;
 	usbd_status error;
 
 	error = urtw_8225v2_set_txpwrlvl(sc, chan);
@@ -3195,7 +3193,7 @@
 	else
 		urtw_write8_m(sc, URTW_SLOT, 0x14);
 	
-	if (gset) {
+	if (IEEE80211_IS_CHAN_G(c)) {
 		/* for G */
 		urtw_write8_m(sc, URTW_DIFS, 0x14);
 		urtw_write8_m(sc, URTW_EIFS, 0x5b - 0x14);