From owner-p4-projects@FreeBSD.ORG Mon Feb 11 03:47:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7548B16A41A; Mon, 11 Feb 2008 03:47:16 +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 3AAE316A418 for ; Mon, 11 Feb 2008 03:47:16 +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 1AA8A13C44B for ; Mon, 11 Feb 2008 03:47:16 +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 m1B3lG2b024671 for ; Mon, 11 Feb 2008 03:47:16 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1B3lFkb024668 for perforce@freebsd.org; Mon, 11 Feb 2008 03:47:15 GMT (envelope-from sephe@FreeBSD.org) Date: Mon, 11 Feb 2008 03:47:15 GMT Message-Id: <200802110347.m1B3lFkb024668@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 135191 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 03:47:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=135191 Change 135191 by sephe@sephe_zealot:sam_wifi on 2008/02/11 03:47:00 Current channel's rate table is in ieee80211com now. Affected files ... .. //depot/projects/wifi/sys/dev/ral/rt2560.c#34 edit .. //depot/projects/wifi/sys/dev/ral/rt2560var.h#11 edit .. //depot/projects/wifi/sys/dev/ral/rt2661.c#25 edit .. //depot/projects/wifi/sys/dev/ral/rt2661var.h#9 edit Differences ... ==== //depot/projects/wifi/sys/dev/ral/rt2560.c#34 (text) ==== @@ -1488,7 +1488,7 @@ desc->plcp_service = 4; len += IEEE80211_CRC_LEN; - if (ieee80211_rate2phytype(sc->sc_currates, rate) == IEEE80211_T_OFDM) { + if (ieee80211_rate2phytype(ic->ic_currates, rate) == IEEE80211_T_OFDM) { desc->flags |= htole32(RT2560_TX_OFDM); plcp_length = len & 0xfff; @@ -1626,7 +1626,7 @@ if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) { flags |= RT2560_TX_ACK; - dur = ieee80211_ack_duration(sc->sc_currates, rate, + dur = ieee80211_ack_duration(ic->ic_currates, rate, ic->ic_flags); *(uint16_t *)wh->i_dur = htole16(dur); @@ -1811,12 +1811,12 @@ rtsrate = IEEE80211_IS_CHAN_5GHZ(ic->ic_curchan) ? 12 : 2; - dur = ieee80211_ack_duration(sc->sc_currates, + dur = ieee80211_ack_duration(ic->ic_currates, rtsrate, ic->ic_flags) - + ieee80211_compute_duration(sc->sc_currates, + + ieee80211_compute_duration(ic->ic_currates, m0->m_pkthdr.len + IEEE80211_CRC_LEN, rate, ic->ic_flags) - + ieee80211_ack_duration(sc->sc_currates, + + ieee80211_ack_duration(ic->ic_currates, rate, ic->ic_flags); m = rt2560_get_rts(sc, wh, dur); @@ -1923,7 +1923,7 @@ if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) { flags |= RT2560_TX_ACK; - dur = ieee80211_ack_duration(sc->sc_currates, rate, + dur = ieee80211_ack_duration(ic->ic_currates, rate, ic->ic_flags); *(uint16_t *)wh->i_dur = htole16(dur); } @@ -2229,7 +2229,6 @@ chan = ieee80211_chan2ieee(ic, c); if (chan == 0 || chan == IEEE80211_CHAN_ANY) return; - sc->sc_currates = ieee80211_get_ratetable(c); if (IEEE80211_IS_CHAN_2GHZ(c)) power = min(sc->txpow[chan - 1], 31); ==== //depot/projects/wifi/sys/dev/ral/rt2560var.h#11 (text) ==== @@ -165,7 +165,6 @@ #define RT2560_F_PRIO_OACTIVE 0x2 #define RT2560_F_DATA_OACTIVE 0x4 int sc_flags; - const struct ieee80211_rate_table *sc_currates; }; int rt2560_attach(device_t, int); ==== //depot/projects/wifi/sys/dev/ral/rt2661.c#25 (text) ==== @@ -1356,7 +1356,7 @@ desc->plcp_service = 4; len += IEEE80211_CRC_LEN; - if (ieee80211_rate2phytype(sc->sc_currates, rate) == IEEE80211_T_OFDM) { + if (ieee80211_rate2phytype(ic->ic_currates, rate) == IEEE80211_T_OFDM) { desc->flags |= htole32(RT2661_TX_OFDM); plcp_length = len & 0xfff; @@ -1442,7 +1442,7 @@ if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) { flags |= RT2661_TX_NEED_ACK; - dur = ieee80211_ack_duration(sc->sc_currates, + dur = ieee80211_ack_duration(ic->ic_currates, rate, ic->ic_flags); *(uint16_t *)wh->i_dur = htole16(dur); @@ -1567,12 +1567,12 @@ rtsrate = IEEE80211_IS_CHAN_5GHZ(ic->ic_curchan) ? 12 : 2; - dur = ieee80211_ack_duration(sc->sc_currates, + dur = ieee80211_ack_duration(ic->ic_currates, rtsrate, ic->ic_flags) - + ieee80211_compute_duration(sc->sc_currates, + + ieee80211_compute_duration(ic->ic_currates, m0->m_pkthdr.len + IEEE80211_CRC_LEN, rate, ic->ic_flags) - + ieee80211_ack_duration(sc->sc_currates, + + ieee80211_ack_duration(ic->ic_currates, rate, ic->ic_flags); m = rt2661_get_rts(sc, wh, dur); @@ -1676,7 +1676,7 @@ if (!noack && !IEEE80211_IS_MULTICAST(wh->i_addr1)) { flags |= RT2661_TX_NEED_ACK; - dur = ieee80211_ack_duration(sc->sc_currates, rate, + dur = ieee80211_ack_duration(ic->ic_currates, rate, ic->ic_flags); *(uint16_t *)wh->i_dur = htole16(dur); } @@ -2137,8 +2137,6 @@ if (chan == 0 || chan == IEEE80211_CHAN_ANY) return; - sc->sc_currates = ieee80211_get_ratetable(c); - /* select the appropriate RF settings based on what EEPROM says */ rfprog = (sc->rfprog == 0) ? rt2661_rf5225_1 : rt2661_rf5225_2; ==== //depot/projects/wifi/sys/dev/ral/rt2661var.h#9 (text) ==== @@ -168,7 +168,6 @@ int sc_txtap_len; #define RAL_INPUT_RUNNING 1 int sc_flags; - const struct ieee80211_rate_table *sc_currates; }; int rt2661_attach(device_t, int);