From owner-p4-projects@FreeBSD.ORG  Thu Jan  8 02:51:17 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 104711065672; Thu,  8 Jan 2009 02:51:17 +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 C466F106564A
	for <perforce@FreeBSD.org>; Thu,  8 Jan 2009 02:51:16 +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 B311F8FC14
	for <perforce@FreeBSD.org>; Thu,  8 Jan 2009 02:51:16 +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 n082pGQR021674
	for <perforce@FreeBSD.org>; Thu, 8 Jan 2009 02:51:16 GMT
	(envelope-from weongyo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n082pG6n021672
	for perforce@freebsd.org; Thu, 8 Jan 2009 02:51:16 GMT
	(envelope-from weongyo@FreeBSD.org)
Date: Thu, 8 Jan 2009 02:51:16 GMT
Message-Id: <200901080251.n082pG6n021672@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 155794 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 02:51:17 -0000

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

Change 155794 by weongyo@weongyo_ws on 2009/01/08 02:51:09

	some comments and remove magic values to handle preamble modes.

Affected files ...

.. //depot/projects/vap/sys/dev/usb/if_urtw.c#11 edit
.. //depot/projects/vap/sys/dev/usb/if_urtwvar.h#3 edit

Differences ...

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

@@ -508,8 +508,11 @@
 	sc->sc_rts_retry = URTW_DEFAULT_RTS_RETRY;
 	sc->sc_tx_retry = URTW_DEFAULT_TX_RETRY;
 	sc->sc_currate = 3;
-	/* XXX for what?  */
-	sc->sc_preamble_mode = 2;
+	/*
+	 * XXX there's no points to set this variable to
+	 * URTW_PREAMBLE_MODE_SHORT so we need to set it properly.
+	 */
+	sc->sc_preamble_mode = URTW_PREAMBLE_MODE_LONG;
 
 	ifp = sc->sc_ifp = if_alloc(IFT_IEEE80211);
 	if (ifp == NULL) {
@@ -2381,10 +2384,11 @@
 	data->buf[1] = (m0->m_pkthdr.len & 0x0f00) >> 8;
 	data->buf[1] |= (1 << 7);
 
-	/* XXX sc_preamble_mode is always 2.  */
+	/* XXX sc_preamble_mode is always URTW_PREAMBLE_MODE_LONG.  */
 	if ((ic->ic_flags & IEEE80211_F_SHPREAMBLE) &&
 	    (ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_PREAMBLE) &&
-	    (sc->sc_preamble_mode == 1) && (sc->sc_currate != 0))
+	    (sc->sc_preamble_mode == URTW_PREAMBLE_MODE_SHORT) &&
+	    (sc->sc_currate != 0))
 		data->buf[2] |= 1;
 	if ((m0->m_pkthdr.len > vap->iv_rtsthreshold) &&
 	    prior == URTW_PRIORITY_LOW)

==== //depot/projects/vap/sys/dev/usb/if_urtwvar.h#3 (text+ko) ====

@@ -129,6 +129,8 @@
 	uint8_t				sc_rts_retry;
 	uint8_t				sc_tx_retry;
 	uint8_t				sc_preamble_mode;
+#define	URTW_PREAMBLE_MODE_SHORT	1
+#define	URTW_PREAMBLE_MODE_LONG		2
 	struct callout			sc_watchdog_ch;
 	int				sc_txtimer;
 	int				sc_currate;