From owner-p4-projects@FreeBSD.ORG Mon Feb 11 04:44:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9747416A419; Mon, 11 Feb 2008 04:44:19 +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 5CAE516A417 for ; Mon, 11 Feb 2008 04:44:19 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 452ED13C4EC for ; Mon, 11 Feb 2008 04:44:19 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1B4iJuM028927 for ; Mon, 11 Feb 2008 04:44:19 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1B4iJvC028924 for perforce@freebsd.org; Mon, 11 Feb 2008 04:44:19 GMT (envelope-from sephe@FreeBSD.org) Date: Mon, 11 Feb 2008 04:44:19 GMT Message-Id: <200802110444.m1B4iJvC028924@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 135193 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Feb 2008 04:44:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=135193 Change 135193 by sephe@sephe_zealot:sam_wifi on 2008/02/11 04:43:42 Reorder rate field in rate table; this probably could save us some space. Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_phy.c#8 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_phy.c#8 (text+ko) ==== @@ -84,13 +84,13 @@ uint8_t rateCodeToIndex[256]; /* back mapping */ struct { uint8_t phy; /* CCK/OFDM/TURBO */ - uint32_t rateKbps; /* transfer rate in kbs */ uint8_t shortPreamble; /* mask for enabling short * preamble in CCK rate code */ uint8_t dot11Rate; /* value for supported rates * info element of MLME */ uint8_t ctlRateIndex; /* index of next lower basic * rate; used for dur. calcs */ + uint32_t rateKbps; /* transfer rate in kbs */ uint16_t lpAckDuration; /* long preamble ACK dur. */ uint16_t spAckDuration; /* short preamble ACK dur. */ } info[32]; @@ -112,13 +112,13 @@ 4, /* number of rates, XXX no PBCC */ { 0 }, { -/* short ctrl */ -/* Preamble dot11Rate Rate */ -/* 1 Mb */ { CCK, 1000, 0x00, (0x80| 2), 0 }, -/* 2 Mb */ { CCK, 2000, 0x04, (0x80| 4), 1 }, -/* 5.5 Mb */ { CCK, 5500, 0x04, (0x80|11), 1 }, -/* 11 Mb */ { CCK, 11000, 0x04, (0x80|22), 1 }, -/* 22 Mb */ { PBCC, 22000, 0x04, 44, 3 } +/* short ctrl */ +/* Preamble dot11Rate Rate */ +/* 1 Mb */ { CCK, 0x00, (0x80| 2), 0, 1000 }, +/* 2 Mb */ { CCK, 0x04, (0x80| 4), 1, 2000 }, +/* 5.5 Mb */ { CCK, 0x04, (0x80|11), 1, 5500 }, +/* 11 Mb */ { CCK, 0x04, (0x80|22), 1, 11000 }, +/* 22 Mb */ { PBCC, 0x04, 44, 3, 22000 } }, }; @@ -127,20 +127,20 @@ 12, /* number of rates */ { 0 }, { -/* short ctrl */ -/* Preamble dot11Rate Rate */ -/* 1 Mb */ { CCK, 1000, 0x00, (0x80| 2), 0 }, -/* 2 Mb */ { CCK, 2000, 0x04, (0x80| 4), 1 }, -/* 5.5 Mb */ { CCK, 5500, 0x04, (0x80|11), 2 }, -/* 11 Mb */ { CCK, 11000, 0x04, (0x80|22), 3 }, -/* 6 Mb */ { OFDM, 6000, 0x00, 12, 4 }, -/* 9 Mb */ { OFDM, 9000, 0x00, 18, 4 }, -/* 12 Mb */ { OFDM, 12000, 0x00, 24, 6 }, -/* 18 Mb */ { OFDM, 18000, 0x00, 36, 6 }, -/* 24 Mb */ { OFDM, 24000, 0x00, 48, 8 }, -/* 36 Mb */ { OFDM, 36000, 0x00, 72, 8 }, -/* 48 Mb */ { OFDM, 48000, 0x00, 96, 8 }, -/* 54 Mb */ { OFDM, 54000, 0x00, 108, 8 } +/* short ctrl */ +/* Preamble dot11Rate Rate */ +/* 1 Mb */ { CCK, 0x00, (0x80| 2), 0, 1000 }, +/* 2 Mb */ { CCK, 0x04, (0x80| 4), 1, 2000 }, +/* 5.5 Mb */ { CCK, 0x04, (0x80|11), 2, 5500 }, +/* 11 Mb */ { CCK, 0x04, (0x80|22), 3, 11000 }, +/* 6 Mb */ { OFDM, 0x00, 12, 4, 6000 }, +/* 9 Mb */ { OFDM, 0x00, 18, 4, 9000 }, +/* 12 Mb */ { OFDM, 0x00, 24, 6, 12000 }, +/* 18 Mb */ { OFDM, 0x00, 36, 6, 18000 }, +/* 24 Mb */ { OFDM, 0x00, 48, 8, 24000 }, +/* 36 Mb */ { OFDM, 0x00, 72, 8, 36000 }, +/* 48 Mb */ { OFDM, 0x00, 96, 8, 48000 }, +/* 54 Mb */ { OFDM, 0x00, 108, 8, 54000 } }, }; @@ -148,16 +148,16 @@ 8, /* number of rates */ { 0 }, { -/* short ctrl */ -/* Preamble dot11Rate Rate */ -/* 6 Mb */ { OFDM, 6000, 0x00, (0x80|12), 0 }, -/* 9 Mb */ { OFDM, 9000, 0x00, 18, 0 }, -/* 12 Mb */ { OFDM, 12000, 0x00, (0x80|24), 2 }, -/* 18 Mb */ { OFDM, 18000, 0x00, 36, 2 }, -/* 24 Mb */ { OFDM, 24000, 0x00, (0x80|48), 4 }, -/* 36 Mb */ { OFDM, 36000, 0x00, 72, 4 }, -/* 48 Mb */ { OFDM, 48000, 0x00, 96, 4 }, -/* 54 Mb */ { OFDM, 54000, 0x00, 108, 4 } +/* short ctrl */ +/* Preamble dot11Rate Rate */ +/* 6 Mb */ { OFDM, 0x00, (0x80|12), 0, 6000 }, +/* 9 Mb */ { OFDM, 0x00, 18, 0, 9000 }, +/* 12 Mb */ { OFDM, 0x00, (0x80|24), 2, 12000 }, +/* 18 Mb */ { OFDM, 0x00, 36, 2, 18000 }, +/* 24 Mb */ { OFDM, 0x00, (0x80|48), 4, 24000 }, +/* 36 Mb */ { OFDM, 0x00, 72, 4, 36000 }, +/* 48 Mb */ { OFDM, 0x00, 96, 4, 48000 }, +/* 54 Mb */ { OFDM, 0x00, 108, 4, 54000 } }, }; @@ -165,16 +165,16 @@ 8, /* number of rates */ { 0 }, { -/* short ctrl */ -/* Preamble dot11Rate Rate */ -/* 6 Mb */ { OFDM, 3000, 0x00, (0x80| 6), 0 }, -/* 9 Mb */ { OFDM, 4500, 0x00, 9, 0 }, -/* 12 Mb */ { OFDM, 6000, 0x00, (0x80|12), 2 }, -/* 18 Mb */ { OFDM, 9000, 0x00, 18, 2 }, -/* 24 Mb */ { OFDM, 12000, 0x00, (0x80|24), 4 }, -/* 36 Mb */ { OFDM, 18000, 0x00, 36, 4 }, -/* 48 Mb */ { OFDM, 24000, 0x00, 48, 4 }, -/* 54 Mb */ { OFDM, 27000, 0x00, 54, 4 } +/* short ctrl */ +/* Preamble dot11Rate Rate */ +/* 6 Mb */ { OFDM, 0x00, (0x80| 6), 0, 3000 }, +/* 9 Mb */ { OFDM, 0x00, 9, 0, 4500 }, +/* 12 Mb */ { OFDM, 0x00, (0x80|12), 2, 6000 }, +/* 18 Mb */ { OFDM, 0x00, 18, 2, 9000 }, +/* 24 Mb */ { OFDM, 0x00, (0x80|24), 4, 12000 }, +/* 36 Mb */ { OFDM, 0x00, 36, 4, 18000 }, +/* 48 Mb */ { OFDM, 0x00, 48, 4, 24000 }, +/* 54 Mb */ { OFDM, 0x00, 54, 4, 27000 } }, }; @@ -182,16 +182,16 @@ 8, /* number of rates */ { 0 }, { -/* short ctrl */ -/* Preamble dot11Rate Rate */ -/* 6 Mb */ { OFDM, 1500, 0x00, (0x80| 3), 0 }, -/* 9 Mb */ { OFDM, 2250, 0x00, 4, 0 }, -/* 12 Mb */ { OFDM, 3000, 0x00, (0x80| 6), 2 }, -/* 18 Mb */ { OFDM, 4500, 0x00, 9, 2 }, -/* 24 Mb */ { OFDM, 6000, 0x00, (0x80|12), 4 }, -/* 36 Mb */ { OFDM, 9000, 0x00, 18, 4 }, -/* 48 Mb */ { OFDM, 12000, 0x00, 24, 4 }, -/* 54 Mb */ { OFDM, 13500, 0x00, 27, 4 } +/* short ctrl */ +/* Preamble dot11Rate Rate */ +/* 6 Mb */ { OFDM, 0x00, (0x80| 3), 0, 1500 }, +/* 9 Mb */ { OFDM, 0x00, 4, 0, 2250 }, +/* 12 Mb */ { OFDM, 0x00, (0x80| 6), 2, 3000 }, +/* 18 Mb */ { OFDM, 0x00, 9, 2, 4500 }, +/* 24 Mb */ { OFDM, 0x00, (0x80|12), 4, 6000 }, +/* 36 Mb */ { OFDM, 0x00, 18, 4, 9000 }, +/* 48 Mb */ { OFDM, 0x00, 24, 4, 12000 }, +/* 54 Mb */ { OFDM, 0x00, 27, 4, 13500 } }, }; @@ -199,15 +199,15 @@ 7, /* number of rates */ { 0 }, { -/* short ctrl */ -/* Preamble dot11Rate Rate */ -/* 6 Mb */ { TURBO, 6000, 0x00, (0x80|12), 0 }, -/* 12 Mb */ { TURBO, 12000, 0x00, (0x80|24), 1 }, -/* 18 Mb */ { TURBO, 18000, 0x00, 36, 1 }, -/* 24 Mb */ { TURBO, 24000, 0x00, (0x80|48), 3 }, -/* 36 Mb */ { TURBO, 36000, 0x00, 72, 3 }, -/* 48 Mb */ { TURBO, 48000, 0x00, 96, 3 }, -/* 54 Mb */ { TURBO, 54000, 0x00, 108, 3 } +/* short ctrl */ +/* Preamble dot11Rate Rate */ +/* 6 Mb */ { TURBO, 0x00, (0x80|12), 0, 6000 }, +/* 12 Mb */ { TURBO, 0x00, (0x80|24), 1, 12000 }, +/* 18 Mb */ { TURBO, 0x00, 36, 1, 18000 }, +/* 24 Mb */ { TURBO, 0x00, (0x80|48), 3, 24000 }, +/* 36 Mb */ { TURBO, 0x00, 72, 3, 36000 }, +/* 48 Mb */ { TURBO, 0x00, 96, 3, 48000 }, +/* 54 Mb */ { TURBO, 0x00, 108, 3, 54000 } }, }; @@ -215,16 +215,16 @@ 8, /* number of rates */ { 0 }, { -/* short ctrl */ -/* Preamble dot11Rate Rate */ -/* 6 Mb */ { TURBO, 6000, 0x00, (0x80|12), 0 }, -/* 9 Mb */ { TURBO, 9000, 0x00, 18, 0 }, -/* 12 Mb */ { TURBO, 12000, 0x00, (0x80|24), 2 }, -/* 18 Mb */ { TURBO, 18000, 0x00, 36, 2 }, -/* 24 Mb */ { TURBO, 24000, 0x00, (0x80|48), 4 }, -/* 36 Mb */ { TURBO, 36000, 0x00, 72, 4 }, -/* 48 Mb */ { TURBO, 48000, 0x00, 96, 4 }, -/* 54 Mb */ { TURBO, 54000, 0x00, 108, 4 } +/* short ctrl */ +/* Preamble dot11Rate Rate */ +/* 6 Mb */ { TURBO, 0x00, (0x80|12), 0, 6000 }, +/* 9 Mb */ { TURBO, 0x00, 18, 0, 9000 }, +/* 12 Mb */ { TURBO, 0x00, (0x80|24), 2, 12000 }, +/* 18 Mb */ { TURBO, 0x00, 36, 2, 18000 }, +/* 24 Mb */ { TURBO, 0x00, (0x80|48), 4, 24000 }, +/* 36 Mb */ { TURBO, 0x00, 72, 4, 36000 }, +/* 48 Mb */ { TURBO, 0x00, 96, 4, 48000 }, +/* 54 Mb */ { TURBO, 0x00, 108, 4, 54000 } }, };