Date: Sat, 31 Jan 2004 19:43:29 -0800 (PST) From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 46288 for review Message-ID: <200402010343.i113hT1P032900@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=46288 Change 46288 by sam@sam_ebb on 2004/01/31 19:43:27 use per-node transmit power setting Affected files ... .. //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#21 edit Differences ... ==== //depot/projects/netperf+sockets/sys/dev/ath/if_ath.c#21 (text+ko) ==== @@ -1127,8 +1127,9 @@ (((_ic)->ic_flags & (IEEE80211_F_SHPREAMBLE | IEEE80211_F_USEBARKER))\ == IEEE80211_F_SHPREAMBLE) struct ieee80211com *ic = &sc->sc_ic; + struct ieee80211_node *ni = bf->bf_node; struct ath_hal *ah = sc->sc_ah; - struct ath_node *an = ATH_NODE(bf->bf_node); + struct ath_node *an = ATH_NODE(ni); struct ath_desc *ds; int error; u_int8_t rate; @@ -1159,7 +1160,7 @@ , m->m_pkthdr.len + IEEE80211_CRC_LEN /* packet length */ , sizeof(struct ieee80211_frame) /* header length */ , HAL_PKT_TYPE_BEACON /* Atheros packet type */ - , 0x20 /* txpower XXX */ + , MIN(ni->ni_txpower,60) /* txpower XXX */ , rate, 1 /* series 0 rate/tries */ , HAL_TXKEYIX_INVALID /* no encryption */ , 0 /* antenna mode */ @@ -2203,7 +2204,7 @@ if (iswep) sc->sc_tx_th.wt_flags |= IEEE80211_RADIOTAP_F_WEP; sc->sc_tx_th.wt_rate = ni->ni_rates.rs_rates[ni->ni_txrate]; - sc->sc_tx_th.wt_txpower = 60/2; /* XXX */ + sc->sc_tx_th.wt_txpower = ni->ni_txpower/2; /* XXX units */ sc->sc_tx_th.wt_antenna = antenna; bpf_mtap2(sc->sc_drvbpf, @@ -2223,7 +2224,7 @@ , pktlen /* packet length */ , hdrlen /* header length */ , atype /* Atheros packet type */ - , 60 /* txpower XXX */ + , MIN(ni->ni_txpower,60)/* txpower */ , txrate, try0 /* series 0 rate/tries */ , iswep ? sc->sc_ic.ic_wep_txkey : HAL_TXKEYIX_INVALID , antenna /* antenna mode */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200402010343.i113hT1P032900>